ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2024-12-22 06:57:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Wrap all update errors as Errors

Browse Source
This commit is contained in:
Pablo Carranza Vélez 2015-10-06 14:44:38 +00:00
parent 2d891262a7
commit 6ed2fddd37
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -1,3 +1,4 @@
* Bugfix: wrap all errors from update as Error objects - prevents image cleanup on download failures [Pablo]
* Wait 10 seconds after sending SIGTERM and before sending SIGKILL when stopping a container [petrosagg] * Wait 10 seconds after sending SIGTERM and before sending SIGKILL when stopping a container [petrosagg]
# v1.0.0 # v1.0.0

6
src/application.coffee
View File

@ -303,6 +303,10 @@ executeSpecialActionsAndBootConfig = (env) ->
if !_.isEmpty(bootConfigVars) if !_.isEmpty(bootConfigVars)
device.setBootConfig(bootConfigVars) device.setBootConfig(bootConfigVars)
wrapAsError = (err) ->
return err if _.isError(err)
return new Error(err.message ? err)
UPDATE_IDLE = 0 UPDATE_IDLE = 0
UPDATE_UPDATING = 1 UPDATE_UPDATING = 1
UPDATE_REQUIRED = 2 UPDATE_REQUIRED = 2
@ -448,7 +452,7 @@ application.update = update = (force) ->
.catch (err) -> .catch (err) ->
logSystemEvent(logTypes.updateAppError, app, err) logSystemEvent(logTypes.updateAppError, app, err)
throw err throw err
.catch(_.identity) .catch(wrapAsError)
.filter(_.isError) .filter(_.isError)
.then (failures) -> .then (failures) ->
throw new Error(joinErrorMessages(failures)) if failures.length > 0 throw new Error(joinErrorMessages(failures)) if failures.length > 0