From fb52c2b6844699634f47a608fde0d175b3c1c17a Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@cloudron.io>
Date: Tue, 11 Feb 2020 10:03:26 -0800
Subject: [PATCH] backupupload: it is either result or message

---
 src/backups.js              | 4 ++--
 src/scripts/backupupload.js | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/backups.js b/src/backups.js
index cb38773ea..91975ee2a 100644
--- a/src/backups.js
+++ b/src/backups.js
@@ -727,8 +727,8 @@ function runBackupUpload(uploadConfig, progressCallback, callback) {
         }
 
         callback();
-    }).on('message', function (progress) { // script sends either 'message' or 'result' property
-        if (!progress.result) return progressCallback({ message: `${progress.message} (${progressTag})` });
+    }).on('message', function (progress) { // this is { message } or { result }
+        if ('message' in progress) return progressCallback({ message: `${progress.message} (${progressTag})` });
         debug(`runBackupUpload: result - ${JSON.stringify(progress)}`);
         result = progress.result;
     });
diff --git a/src/scripts/backupupload.js b/src/scripts/backupupload.js
index 7c6dd73c0..8683042ea 100755
--- a/src/scripts/backupupload.js
+++ b/src/scripts/backupupload.js
@@ -58,9 +58,7 @@ initialize(function (error) {
     if (error) throw error;
 
     backups.upload(backupId, format, dataLayoutString, throttledProgressCallback(5000), function resultHandler(error) {
-        if (error) debug('upload completed with error', error);
-
-        debug('upload completed');
+        debug('upload completed. error: ', error);
 
         process.send({ result: error ? error.message : '' });