From aa8cfec2cc4502db24d7e312b0b5f2839db38951 Mon Sep 17 00:00:00 2001 From: James Ketrenos Date: Sat, 8 Sep 2018 19:42:30 -0700 Subject: [PATCH] Clean up error handling with ufraw Signed-off-by: James Ketrenos --- server/scanner.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/server/scanner.js b/server/scanner.js index baa06e4..fa9aa8e 100644 --- a/server/scanner.js +++ b/server/scanner.js @@ -242,14 +242,14 @@ function convertRawToJpg(path, file) { path + "/" + file ]); - let error = ""; + const stderr = []; ufraw.stderr.on('data', function(data) { - error += data; + stderr.push(data); }); - ufraw.on('exit', function(code, signal) { + ufraw.on('exit', function(stderr, code, signal) { if (signal || code != 0) { - let error = "UFRAW for " + path + "/" + file + " returned an error: " + code + "\n" + signal + "\n" + error + "\n"; + let error = "UFRAW for " + path + "/" + file + " returned an error: " + code + "\n" + signal + "\n" + stderr.join("\n") + "\n"; console.error(error); return moveCorrupt(path, file).then(function() { return reject(error); @@ -264,7 +264,7 @@ function convertRawToJpg(path, file) { return resolve(); }); }); - }); + }.bind(this, stderr)); }); }); }