diff --git a/src/cloudron.js b/src/cloudron.js index a2ca54b55..0b20a30d0 100644 --- a/src/cloudron.js +++ b/src/cloudron.js @@ -383,7 +383,7 @@ function renewCerts(options, auditSource, callback) { assert.strictEqual(typeof auditSource, 'object'); assert.strictEqual(typeof callback, 'function'); - let task = tasks.startTask(tasks.TASK_RENEW_CERTS, [ options, auditSource ], auditSource); + let task = tasks.startTask(tasks.TASK_RENEW_CERTS, [ options, auditSource ]); task.on('error', (error) => callback(new CloudronError(CloudronError.INTERNAL_ERROR, error))); task.on('start', (taskId) => callback(null, taskId)); } diff --git a/src/routes/tasks.js b/src/routes/tasks.js index df387dc6c..21303fe72 100644 --- a/src/routes/tasks.js +++ b/src/routes/tasks.js @@ -23,7 +23,7 @@ function auditSource(req) { function stopTask(req, res, next) { assert.strictEqual(typeof req.params.taskId, 'string'); - tasks.stopTask(req.params.taskId, auditSource(req), function (error) { + tasks.stopTask(req.params.taskId, function (error) { if (error && error.reason === TaskError.NOT_FOUND) return next(new HttpError(404, 'No such task')); if (error && error.reason === TaskError.BAD_STATE) return next(new HttpError(409, error.message)); if (error) return next(new HttpError(500, error)); diff --git a/src/routes/test/tasks-test.js b/src/routes/test/tasks-test.js index 5ec30a0cb..9ee66d6ba 100644 --- a/src/routes/test/tasks-test.js +++ b/src/routes/test/tasks-test.js @@ -53,15 +53,13 @@ function cleanup(done) { }); } -let AUDIT_SOURCE = { ip: '1.2.3.4' }; - describe('Tasks API', function () { before(setup); after(cleanup); it('can get task', function (done) { let taskId = null; - let task = tasks.startTask(tasks._TASK_IDENTITY, [ 'ping' ], AUDIT_SOURCE); + let task = tasks.startTask(tasks._TASK_IDENTITY, [ 'ping' ]); task.on('error', done); task.on('start', (tid) => { taskId = tid; }); @@ -81,7 +79,7 @@ describe('Tasks API', function () { it('can get logs', function (done) { let taskId = null; - let task = tasks.startTask(tasks._TASK_CRASH, [ 'ping' ], AUDIT_SOURCE); + let task = tasks.startTask(tasks._TASK_CRASH, [ 'ping' ]); task.on('error', done); task.on('start', (tid) => { taskId = tid; }); @@ -97,7 +95,7 @@ describe('Tasks API', function () { it('cannot stop inactive task', function (done) { let taskId = null; - let task = tasks.startTask(tasks._TASK_IDENTITY, [ 'ping' ], AUDIT_SOURCE); + let task = tasks.startTask(tasks._TASK_IDENTITY, [ 'ping' ]); task.on('error', done); task.on('start', (tid) => { taskId = tid; }); @@ -114,7 +112,7 @@ describe('Tasks API', function () { it('can stop task', function (done) { let taskId = null; - let task = tasks.startTask(tasks._TASK_SLEEP, [ 10000 ], AUDIT_SOURCE); + let task = tasks.startTask(tasks._TASK_SLEEP, [ 10000 ]); task.on('error', done); task.on('start', (tid) => { taskId = tid; diff --git a/src/tasks.js b/src/tasks.js index f85c55f7f..238965748 100644 --- a/src/tasks.js +++ b/src/tasks.js @@ -93,10 +93,9 @@ function update(id, task, callback) { }); } -function startTask(type, args, auditSource) { +function startTask(type, args) { assert.strictEqual(typeof type, 'string'); assert(Array.isArray(args)); - assert.strictEqual(typeof auditSource, 'object'); let events = new EventEmitter(); @@ -140,9 +139,8 @@ function startTask(type, args, auditSource) { return events; } -function stopTask(id, auditSource, callback) { +function stopTask(id, callback) { assert.strictEqual(typeof id, 'string'); - assert.strictEqual(typeof auditSource, 'object'); assert.strictEqual(typeof callback, 'function'); if (!gTasks[id]) return callback(new TaskError(TaskError.BAD_STATE, 'task is not active')); diff --git a/src/test/tasks-test.js b/src/test/tasks-test.js index d206327e3..577ab0f57 100644 --- a/src/test/tasks-test.js +++ b/src/test/tasks-test.js @@ -13,8 +13,6 @@ var async = require('async'), paths = require('../paths.js'), tasks = require('../tasks.js'); -let AUDIT_SOURCE = { ip: '1.2.3.4' }; - function setup(done) { async.series([ database.initialize, @@ -35,7 +33,7 @@ describe('task', function () { it('can run valid task - success', function (done) { let taskId = null; - let task = tasks.startTask(tasks._TASK_IDENTITY, [ 'ping' ], AUDIT_SOURCE); + let task = tasks.startTask(tasks._TASK_IDENTITY, [ 'ping' ]); task.on('error', done); task.on('start', (tid) => { taskId = tid; }); task.on('finish', function (error, result) { @@ -48,7 +46,7 @@ describe('task', function () { it('can run valid task - error', function (done) { let taskId = null; - let task = tasks.startTask(tasks._TASK_ERROR, [ 'ping' ], AUDIT_SOURCE); + let task = tasks.startTask(tasks._TASK_ERROR, [ 'ping' ]); task.on('error', done); task.on('start', (tid) => { taskId = tid; }); task.on('finish', function (error, result) { @@ -62,7 +60,7 @@ describe('task', function () { it('can get logs of crash', function (done) { let taskId = null; - let task = tasks.startTask(tasks._TASK_CRASH, [ 'ping' ], AUDIT_SOURCE); + let task = tasks.startTask(tasks._TASK_CRASH, [ 'ping' ]); task.on('error', done); task.on('start', (tid) => { taskId = tid; }); task.on('finish', function (error, result) { @@ -79,11 +77,11 @@ describe('task', function () { it('can stop task', function (done) { let taskId = null; - let task = tasks.startTask(tasks._TASK_SLEEP, [ 10000 ], AUDIT_SOURCE); + let task = tasks.startTask(tasks._TASK_SLEEP, [ 10000 ]); task.on('error', done); task.on('start', (tid) => { taskId = tid; - tasks.stopTask(taskId, AUDIT_SOURCE, () => {}); + tasks.stopTask(taskId, () => {}); }); task.on('finish', function (error, result) { expect(error).to.be.ok(); diff --git a/src/updater.js b/src/updater.js index 097300deb..82a0fe01f 100644 --- a/src/updater.js +++ b/src/updater.js @@ -192,7 +192,7 @@ function updateToLatest(auditSource, callback) { let error = locker.lock(locker.OP_BOX_UPDATE); if (error) return callback(error); - let task = tasks.startTask(tasks.TASK_UPDATE, [ boxUpdateInfo ], auditSource); + let task = tasks.startTask(tasks.TASK_UPDATE, [ boxUpdateInfo ]); task.on('error', (error) => callback(new UpdaterError(UpdaterError.INTERNAL_ERROR, error))); task.on('start', (taskId) => { eventlog.add(eventlog.ACTION_UPDATE, auditSource, { taskId });