From ba9477cdb3cdc2f2c041889b65ebdf6e89ba76f9 Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Thu, 22 Jun 2017 09:41:36 +0100 Subject: [PATCH] Re-work error checking --- services/filestore/app/coffee/ImageOptimiser.coffee | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/services/filestore/app/coffee/ImageOptimiser.coffee b/services/filestore/app/coffee/ImageOptimiser.coffee index 939023a997..fb2001a1d0 100644 --- a/services/filestore/app/coffee/ImageOptimiser.coffee +++ b/services/filestore/app/coffee/ImageOptimiser.coffee @@ -11,11 +11,12 @@ module.exports = timeout: 30 * 1000 killSignal: "SIGKILL" exec args, opts,(err, stdout, stderr)-> - if err? and err?.signal == 'SIGKILL' - logger.warn {err: err, stderr: stderr, localPath: localPath}, "optimiser timeout reached" - err = null if err? - logger.err err:err, stderr:stderr, localPath:localPath, "something went wrong converting compressPng" + if err.signal == 'SIGKILL' + logger.warn {err: err, stderr: stderr, localPath: localPath}, "optimiser timeout reached" + err = null + else + logger.err err:err, stderr:stderr, localPath:localPath, "something went wrong converting compressPng" else logger.log localPath:localPath, "finished compressPng file" callback(err)