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/scripts/backupupload.js
View File

@@ -4,9 +4,9 @@
if (process.argv[2] === '--check') return console.log('OK');
var assert = require('assert'),
const assert = require('assert'),
async = require('async'),
backups = require('../backups.js'),
backuptask = require('../backuptask.js'),
database = require('../database.js'),
debug = require('debug')('box:backupupload'),
settings = require('../settings.js'),
@@ -66,7 +66,7 @@ initialize(function (error) {
dumpMemoryInfo();
const timerId = setInterval(dumpMemoryInfo, 30000);
backups.upload(backupId, format, dataLayoutString, throttledProgressCallback(5000), function resultHandler(error) {
backuptask.upload(backupId, format, dataLayoutString, throttledProgressCallback(5000), function resultHandler(error) {
debug('upload completed. error: ', error);
process.send({ result: error ? error.message : '' });