diff --git a/src/backups.js b/src/backups.js index fd9d03191..50f393577 100644 --- a/src/backups.js +++ b/src/backups.js @@ -901,9 +901,13 @@ function snapshotBox(progressCallback, callback) { progressCallback({ message: 'Snapshotting box' }); + const startTime = new Date(); + database.exportToFile(`${paths.BOX_DATA_DIR}/box.mysqldump`, function (error) { if (error) return callback(new BoxError(BoxError.DATABASE_ERROR, error)); + debug(`snapshotBox: took ${(new Date() - startTime)/1000} seconds`); + return callback(); }); } @@ -913,8 +917,6 @@ function uploadBoxSnapshot(backupConfig, progressCallback, callback) { assert.strictEqual(typeof progressCallback, 'function'); assert.strictEqual(typeof callback, 'function'); - var startTime = new Date(); - snapshotBox(progressCallback, function (error) { if (error) return callback(error); @@ -930,10 +932,12 @@ function uploadBoxSnapshot(backupConfig, progressCallback, callback) { progressCallback({ message: 'Uploading box snapshot' }); + const startTime = new Date(); + runBackupUpload(uploadConfig, progressCallback, function (error) { if (error) return callback(error); - debug('uploadBoxSnapshot: time: %s secs', (new Date() - startTime)/1000); + debug(`uploadBoxSnapshot: took ${(new Date() - startTime)/1000} seconds`); setSnapshotInfo('box', { timestamp: new Date().toISOString(), format: backupConfig.format }, callback); }); @@ -1021,6 +1025,7 @@ function snapshotApp(app, progressCallback, callback) { assert.strictEqual(typeof progressCallback, 'function'); assert.strictEqual(typeof callback, 'function'); + const startTime = new Date(); progressCallback({ message: `Snapshotting app ${app.fqdn}` }); if (!safe.fs.writeFileSync(path.join(paths.APPS_DATA_DIR, app.id + '/config.json'), JSON.stringify(app))) { @@ -1030,6 +1035,8 @@ function snapshotApp(app, progressCallback, callback) { addons.backupAddons(app, app.manifest.addons, function (error) { if (error) return callback(new BoxError(BoxError.EXTERNAL_ERROR, error.message)); + debugApp(app, `snapshotApp: took ${(new Date() - startTime)/1000} seconds`); + return callback(null); }); } @@ -1088,8 +1095,6 @@ function uploadAppSnapshot(backupConfig, app, progressCallback, callback) { assert.strictEqual(typeof progressCallback, 'function'); assert.strictEqual(typeof callback, 'function'); - var startTime = new Date(); - snapshotApp(app, progressCallback, function (error) { if (error) return callback(error); @@ -1108,10 +1113,12 @@ function uploadAppSnapshot(backupConfig, app, progressCallback, callback) { progressTag: app.fqdn }; + const startTime = new Date(); + runBackupUpload(uploadConfig, progressCallback, function (error) { if (error) return callback(error); - debugApp(app, 'uploadAppSnapshot: %s done time: %s secs', backupId, (new Date() - startTime)/1000); + debugApp(app, `uploadAppSnapshot: ${backupId} done. ${(new Date() - startTime)/1000} seconds`); setSnapshotInfo(app.id, { timestamp: new Date().toISOString(), manifest: app.manifest, format: backupConfig.format }, callback); }); diff --git a/src/taskworker.js b/src/taskworker.js index 29a9f0cab..932732e12 100755 --- a/src/taskworker.js +++ b/src/taskworker.js @@ -47,6 +47,7 @@ function initialize(callback) { } // Main process starts here +const startTime = new Date(); debug(`Starting task ${taskId}`); initialize(function (error) { @@ -63,6 +64,8 @@ initialize(function (error) { error: error ? JSON.parse(JSON.stringify(error, Object.getOwnPropertyNames(error))) : null }; + debug(`Task took ${(new Date() - startTime)/1000} seconds`); + tasks.setCompleted(taskId, progress, () => process.exit(error ? 50 : 0)); };