Make cleanup reliable if a local build fails

This commit is contained in:
Tim Perry 2017-06-14 12:26:16 +02:00
parent 66a4faeea5
commit 5a28d4c92f
2 changed files with 5 additions and 2 deletions

View File

@ -229,7 +229,9 @@ module.exports = {
logs = buildLogs;
return Promise.all([dockerUtils.bufferImage(docker, imageName, bufferFile), token, username, url, params.appName, logStreams]).spread(performUpload);
})["finally"](function() {
return require('mz/fs').unlink(bufferFile)["catch"](_.noop);
return Promise["try"](function() {
return require('mz/fs').unlink(bufferFile);
})["catch"](_.noop);
});
});
}).tap(function(arg) {

View File

@ -206,7 +206,8 @@ module.exports =
# If the file was never written to (for instance because an error
# has occured before any data was written) this call will throw an
# ugly error, just suppress it
require('mz/fs').unlink(bufferFile)
Promise.try ->
require('mz/fs').unlink(bufferFile)
.catch(_.noop)
.tap ({ image: imageName, buildId }) ->
logging.logSuccess(logStreams, "Successfully deployed image: #{formatImageName(imageName)}")