ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-03-22 12:05:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Force a newer bluebird so that we can rely on error properties also being available on the root error.

Browse Source
This commit is contained in:
Pagan Gazzard 2015-04-15 22:18:29 +01:00 committed by Pablo Carranza Vélez
parent 2387402c35
commit 1ee3072c75
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -8,7 +8,7 @@
"dependencies": {
"JSONStream": "^0.10.0",
"blinking": "~0.0.2",
"bluebird": "^2.6.0",
"bluebird": "^2.9.24",
"body-parser": "^1.12.0",
"coffee-script": "~1.9.1",
"dockerode": "~2.1.1",

10
src/application.coffee
View File

@ -69,11 +69,9 @@ logSystemEvent = (logType, app, error) ->
message = "#{logType.humanName} '#{app.imageId}'"
if error?
# Report the message from the original cause to the user.
errMessage = error.cause?.json
errMessage = error.json
if _.isEmpty(errMessage)
errMessage = error.cause?.reason
if _.isEmpty(errMessage)
errMessage = error.cause?.message
errMessage = error.reason
if _.isEmpty(errMessage)
errMessage = error.message
if _.isEmpty(errMessage)
@ -99,7 +97,7 @@ kill = (app) ->
.catch Promise.OperationalError, (err) ->
# Get the statusCode from the original cause and make sure statusCode its definitely a string for comparison
# reasons.
statusCode = '' + err.cause.statusCode
statusCode = '' + err.statusCode
# 304 means the container was already stopped - so we can just remove it
if statusCode is '304'
return container.removeAsync()
@ -212,7 +210,7 @@ exports.start = start = (app) ->
]
)
.catch (err) ->
statusCode = '' + err.cause?.statusCode
statusCode = '' + err.statusCode
# 304 means the container was already started, precisely what we want :)
if statusCode is '304'
return