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

Various backup fixes

Browse Source
This commit is contained in:
Girish Ramakrishnan
2017-10-11 13:57:05 -07:00
parent 28ce5f41e3
commit dd68c8f91f
4 changed files with 62 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/backups.js
View File

@@ -558,7 +558,7 @@ function rotateBoxBackup(backupConfig, timestamp, appBackupIds, callback) {
const state = copyBackupError ? backupdb.BACKUP_STATE_ERROR : backupdb.BACKUP_STATE_NORMAL;
backupdb.update(backupId, { state: state }, function (error) {
if (copyBackupError) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, copyBackupError.message));
if (copyBackupError) return callback(copyBackupError);
if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
log(`Rotated box backup successfully as id ${backupId}`);
@@ -657,12 +657,13 @@ function rotateAppBackup(backupConfig, app, timestamp, callback) {
copy.on('progress', log);
copy.on('done', function (copyBackupError) {
const state = copyBackupError ? backupdb.BACKUP_STATE_ERROR : backupdb.BACKUP_STATE_NORMAL;
log(`Rotated app backup of ${app.id} successfully to id ${backupId}`);
backupdb.update(backupId, { state: state }, function (error) {
if (copyBackupError) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, copyBackupError.message));
if (copyBackupError) return callback(copyBackupError);
if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
log(`Rotated app backup of ${app.id} successfully to id ${backupId}`);
setRestorePoint(app.id, backupId, function (error) {
if (error) return callback(error);