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

merge backupdb into backups.js

Browse Source
This commit is contained in:
Girish Ramakrishnan
2021-07-14 11:07:19 -07:00
parent ac70350531
commit 004e812d60
17 changed files with 1821 additions and 1898 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/settings.js
View File

@@ -417,14 +417,14 @@ function setBackupConfig(backupConfig, callback) {
backups.injectPrivateFields(backupConfig, oldConfig);
if (backups.isMountProvider(backupConfig.provider) && (!backups.isMountProvider(oldConfig.provider) || mountOptionsChanged(oldConfig, backupConfig))) {
if (mounts.isMountProvider(backupConfig.provider) && (!mounts.isMountProvider(oldConfig.provider) || mountOptionsChanged(oldConfig, backupConfig))) {
error = mounts.validateMountOptions(backupConfig.provider, backupConfig.mountOptions);
if (error) return callback(error);
[error] = await safe(mounts.tryAddMount(mountObject(backupConfig), { timeout: 10 })); // 10 seconds
if (error) {
if (backups.isMountProvider(oldConfig.provider)) { // put back the old mount configuration
if (mounts.isMountProvider(oldConfig.provider)) { // put back the old mount configuration
debug('setBackupConfig: rolling back to previous mount configuration');
await safe(mounts.tryAddMount(mountObject(oldConfig), { timeout: 10 }));
@@ -451,7 +451,7 @@ function setBackupConfig(backupConfig, callback) {
settingsdb.set(exports.BACKUP_CONFIG_KEY, JSON.stringify(backupConfig), async function (error) {
if (error) return callback(error);
if (backups.isMountProvider(oldConfig.provider) && !backups.isMountProvider(backupConfig.provider)) {
if (mounts.isMountProvider(oldConfig.provider) && !mounts.isMountProvider(backupConfig.provider)) {
debug('setBackupConfig: removing old backup mount point');
await safe(mounts.removeMount(mountObject(oldConfig)));
}