jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Set the correct progress percentage

Browse Source
This commit is contained in:
Johannes Zellner
2017-01-12 15:12:41 +01:00
parent a8d254738e
commit d98f64094e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/backups.js
+4 -4
View File
@@ -352,10 +352,10 @@ function backupBoxAndApps(auditSource, callback) {
var processed = 0; var processed = 0;
var step = 100/(allApps.length+1); var step = 100/(allApps.length+1);
progress.set(progress.BACKUP, processed, ''); progress.set(progress.BACKUP, step * processed, '');
async.mapSeries(allApps, function iterator(app, iteratorCallback) { 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; ++processed;
@@ -365,7 +365,7 @@ function backupBoxAndApps(auditSource, callback) {
return iteratorCallback(error); 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 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 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) { backupBoxWithAppBackupIds(backupIds, prefix, function (error, filename) {
progress.set(progress.BACKUP, 100, error ? error.message : ''); progress.set(progress.BACKUP, 100, error ? error.message : '');