diff --git a/migrations/20181116191032-tasks-add-table.js b/migrations/20181116191032-tasks-add-table.js index d1585b2ac..2c22a42aa 100644 --- a/migrations/20181116191032-tasks-add-table.js +++ b/migrations/20181116191032-tasks-add-table.js @@ -5,7 +5,7 @@ exports.up = function(db, callback) { "id VARCHAR(32) NOT NULL UNIQUE," + "percent INTEGER DEFAULT 0," + "message TEXT," + - "detail TEXT," + + "errorMessage TEXT," + "result TEXT," + "creationTime TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP," + "ts TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP," + diff --git a/migrations/schema.sql b/migrations/schema.sql index 6f1c62e8c..221e7bf0e 100644 --- a/migrations/schema.sql +++ b/migrations/schema.sql @@ -201,7 +201,7 @@ CREATE TABLE IF NOT EXISTS tasks( id VARCHAR(32) NOT NULL UNIQUE, percent INTEGER DEFAULT 0, message TEXT, - detail TEXT, + errorMessage TEXT, result TEXT, creationTime TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, ts TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, diff --git a/src/backups.js b/src/backups.js index 33c968775..7427c9053 100644 --- a/src/backups.js +++ b/src/backups.js @@ -969,7 +969,7 @@ function startBackupTask(auditSource, callback) { gBackupTask = null; - tasks.setProgress(tasks.TASK_BACKUP, { percent: 100, result: error ? error.message : '' }, NOOP_CALLBACK); + tasks.setProgress(tasks.TASK_BACKUP, { percent: 100, errorMessage: error ? error.message : '' }, NOOP_CALLBACK); locker.unlock(locker.OP_FULL_BACKUP); diff --git a/src/caas.js b/src/caas.js index 781c17211..70b7bed55 100644 --- a/src/caas.js +++ b/src/caas.js @@ -127,10 +127,10 @@ function doMigrate(options, caasConfig, callback) { function unlock(error) { debug('Failed to migrate', error); locker.unlock(locker.OP_MIGRATE); - tasks.setProgress(tasks.TASK_MIGRATE, { percent: -1, result: `Backup failed: ${error.message}` }, NOOP_CALLBACK); + tasks.setProgress(tasks.TASK_MIGRATE, { percent: -1, errorMessage: `Backup failed: ${error.message}` }, NOOP_CALLBACK); } - tasks.setProgress(tasks.TASK_MIGRATE, { percent: 10, result: 'Backing up for migration' }, NOOP_CALLBACK); + tasks.setProgress(tasks.TASK_MIGRATE, { percent: 10, message: 'Backing up for migration' }, NOOP_CALLBACK); // initiate the migration in the background backups.backupBoxAndApps({ userId: null, username: 'migrator' }, (progress) => tasks.setProgress(tasks.TASK_MIGRATE, { percent: 10+progress.percent*30/100, message: progress.message }, NOOP_CALLBACK), function (error) { @@ -149,7 +149,7 @@ function doMigrate(options, caasConfig, callback) { if (result.statusCode === 404) return unlock(new CaasError(CaasError.NOT_FOUND)); if (result.statusCode !== 202) return unlock(new CaasError(CaasError.EXTERNAL_ERROR, util.format('%s %j', result.status, result.body))); - tasks.setProgress(tasks.TASK_MIGRATE, { percent: 40, result: 'Migrating' }, NOOP_CALLBACK); + tasks.setProgress(tasks.TASK_MIGRATE, { percent: 40, message: 'Migrating' }, NOOP_CALLBACK); retire('migrate', _.pick(options, 'domain', 'size', 'region')); }); diff --git a/src/taskdb.js b/src/taskdb.js index 35d04b59f..86c959a44 100644 --- a/src/taskdb.js +++ b/src/taskdb.js @@ -10,7 +10,7 @@ let assert = require('assert'), DatabaseError = require('./databaseerror'), _ = require('underscore'); -const TASKS_FIELDS = [ 'id', 'percent', 'message', 'detail', 'creationTime', 'result', 'ts' ]; +const TASKS_FIELDS = [ 'id', 'percent', 'message', 'errorMessage', 'creationTime', 'result', 'ts' ]; function setProgress(id, progress, callback) { assert.strictEqual(typeof id, 'string'); diff --git a/src/updater.js b/src/updater.js index 73fdd6e7d..6a34b5015 100644 --- a/src/updater.js +++ b/src/updater.js @@ -156,7 +156,7 @@ function doUpdate(boxUpdateInfo, callback) { assert(boxUpdateInfo && typeof boxUpdateInfo === 'object'); function updateError(e) { - tasks.setProgress(tasks.TASK_UPDATE, { percent: -1, result: e.message }, NOOP_CALLBACK); + tasks.setProgress(tasks.TASK_UPDATE, { percent: -1, errorMessage: e.message }, NOOP_CALLBACK); callback(e); }