From d98f64094e578a47a27a69ca6682d84b2f8a2cb7 Mon Sep 17 00:00:00 2001 From: Johannes Zellner Date: Thu, 12 Jan 2017 15:12:41 +0100 Subject: [PATCH] Set the correct progress percentage --- src/backups.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/backups.js b/src/backups.js index 479dd30e9..6cbc00a30 100644 --- a/src/backups.js +++ b/src/backups.js @@ -352,10 +352,10 @@ function backupBoxAndApps(auditSource, callback) { var processed = 0; var step = 100/(allApps.length+1); - progress.set(progress.BACKUP, processed, ''); + progress.set(progress.BACKUP, step * processed, ''); async.mapSeries(allApps, function iterator(app, iteratorCallback) { - progress.set(progress.BACKUP, processed, 'Backing up app at ' + app.location); + progress.set(progress.BACKUP, step * processed, 'Backing up app at ' + (app.altDomain || config.appFqdn(app.location))); ++processed; @@ -365,7 +365,7 @@ function backupBoxAndApps(auditSource, callback) { return iteratorCallback(error); } - progress.set(progress.BACKUP, step * processed, 'Backed up app at ' + app.location); + progress.set(progress.BACKUP, step * processed, 'Backed up app at ' + (app.altDomain || config.appFqdn(app.location))); iteratorCallback(null, backupId || null); // clear backupId if is in BAD_STATE and never backed up }); @@ -377,7 +377,7 @@ function backupBoxAndApps(auditSource, callback) { backupIds = backupIds.filter(function (id) { return id !== null; }); // remove apps in bad state that were never backed up - progress.set(progress.BACKUP, processed, 'Backing up system data'); + progress.set(progress.BACKUP, step * processed, 'Backing up system data'); backupBoxWithAppBackupIds(backupIds, prefix, function (error, filename) { progress.set(progress.BACKUP, 100, error ? error.message : '');