diff --git a/src/apptask.js b/src/apptask.js index 6d94beec6..95729a505 100644 --- a/src/apptask.js +++ b/src/apptask.js @@ -55,6 +55,8 @@ var COLLECTD_CONFIG_EJS = fs.readFileSync(__dirname + '/collectd.config.ejs', { LOGROTATE_CONFIG_EJS = fs.readFileSync(__dirname + '/logrotate.ejs', { encoding: 'utf8' }), CONFIGURE_LOGROTATE_CMD = path.join(__dirname, 'scripts/configurelogrotate.sh'); +var NOOP_CALLBACK = function (error) { if (error) debug(error); }; + function initialize(callback) { assert.strictEqual(typeof callback, 'function'); @@ -581,7 +583,7 @@ function backup(app, callback) { async.series([ updateApp.bind(null, app, { installationProgress: '10, Backing up' }), - backups.backupApp.bind(null, app, (progress) => updateApp(app, { installationProgress: progress.message })), + backups.backupApp.bind(null, app, (progress) => updateApp(app, { installationProgress: progress.message }, NOOP_CALLBACK)), // done! function (callback) { diff --git a/src/scripts/backupupload.js b/src/scripts/backupupload.js index ddb3b036f..212ead40e 100755 --- a/src/scripts/backupupload.js +++ b/src/scripts/backupupload.js @@ -10,8 +10,8 @@ if (process.argv[2] === '--check') return console.log('OK'); require('supererror')({ splatchError: true }); var assert = require('assert'), - backups = require('./backups.js'), - database = require('./database.js'), + backups = require('../backups.js'), + database = require('../database.js'), debug = require('debug')('box:backupupload'); function initialize(callback) {