Stop displaying an error message when trying to start a container that is already started.

This commit is contained in:
Pagan Gazzard 2015-04-15 17:16:20 +01:00 committed by Pablo Carranza Vélez
parent a959660f90
commit e56d9b678e
2 changed files with 5 additions and 0 deletions

View File

@ -1,3 +1,4 @@
* Stopped displaying an error message when trying to start a container that is already started.
* Improved error messages reported to the user in the case of finding an empty string. * Improved error messages reported to the user in the case of finding an empty string.
* Switched to using the dockerode pull progress mechanism. * Switched to using the dockerode pull progress mechanism.
* Fixed trying to delete supervisor container when it reports an alternate tag instead of the primary tag. * Fixed trying to delete supervisor container when it reports an alternate tag instead of the primary tag.

View File

@ -211,6 +211,10 @@ exports.start = start = (app) ->
] ]
) )
.catch (err) -> .catch (err) ->
statusCode = '' + err.cause?.statusCode
# 304 means the container was already started, precisely what we want :)
if statusCode is '304'
return
logSystemEvent(logTypes.startAppError, app, err) logSystemEvent(logTypes.startAppError, app, err)
throw err throw err
.then -> .then ->