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

make backup progress work for per-app backups

Browse Source
This commit is contained in:
Girish Ramakrishnan
2017-09-28 11:12:12 -07:00
parent 404a019c56
commit 565c8445e1
5 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/backups.js
+18 -2
View File
@@ -626,7 +626,7 @@ function uploadAppSnapshot(backupConfig, app, manifest, callback) {
});
}
function backupApp(app, manifest, timestamp, callback) {
function backupAppWithTimestamp(app, manifest, timestamp, callback) {
assert.strictEqual(typeof app, 'object');
assert(manifest && typeof manifest === 'object');
assert.strictEqual(typeof timestamp, 'string');
@@ -645,6 +645,22 @@ function backupApp(app, manifest, timestamp, callback) {
});
}
function backupApp(app, manifest, callback) {
assert.strictEqual(typeof app, 'object');
assert(manifest && typeof manifest === 'object');
assert.strictEqual(typeof callback, 'function');
const timestamp = (new Date()).toISOString().replace(/[T.]/g, '-').replace(/[:Z]/g,'');
progress.set(progress.BACKUP, 10, 'Backing up ' + (app.altDomain || config.appFqdn(app.location)));
backupAppWithTimestamp(app, manifest, timestamp, function (error) {
progress.set(progress.BACKUP, 100, error ? error.message : '');
callback(error);
});
}
// this function expects you to have a lock
function backupBoxAndApps(auditSource, callback) {
assert.strictEqual(typeof auditSource, 'object');
@@ -673,7 +689,7 @@ function backupBoxAndApps(auditSource, callback) {
return iteratorCallback(null, app.lastBackupId); // just use the last backup
}
backupApp(app, app.manifest, timestamp, function (error, backupId) {
backupAppWithTimestamp(app, app.manifest, timestamp, function (error, backupId) {
if (error && error.reason !== BackupsError.BAD_STATE) {
debugApp(app, 'Unable to backup', error);
return iteratorCallback(error);