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

merge caas storage into s3 backend

Browse Source
This commit is contained in:
Girish Ramakrishnan
2017-09-26 12:28:33 -07:00
parent 4e68abe51d
commit a9e89b57d9
6 changed files with 64 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/backups.js
+2 -2
View File
@@ -97,7 +97,7 @@ BackupsError.NOT_FOUND = 'not found';
// choose which storage backend we use for test purpose we use s3
function api(provider) {
switch (provider) {
case 'caas': return require('./storage/caas.js');
case 'caas': return require('./storage/s3.js');
case 's3': return require('./storage/s3.js');
case 'filesystem': return require('./storage/filesystem.js');
case 'minio': return require('./storage/s3.js');
@@ -462,7 +462,7 @@ function rotateBoxBackup(backupConfig, timestamp, appBackupIds, callback) {
debug('rotateBoxBackup: successful id:%s', backupId);
// FIXME this is only needed for caas, hopefully we can remove that in the future
api(backupConfig.provider).backupDone(backupId, appBackupIds, function (error) {
api(backupConfig.provider).backupDone(backupConfig, backupId, appBackupIds, function (error) {
if (error) return callback(error);
callback(null, backupId);