jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Add tasks.setCompleted

Browse Source 
this lets us easily grep the code on where the task is completed
This commit is contained in:
Girish Ramakrishnan
2019-09-05 11:29:46 -07:00
parent 9769fbfcf2
commit 0843f78ec8
3 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/cloudron.js
View File

@@ -51,6 +51,7 @@ var apps = require('./apps.js'),
split = require('split'),
sysinfo = require('./sysinfo.js'),
tasks = require('./tasks.js'),
TaskError = require('./tasks.js').TaskError,
users = require('./users.js'),
util = require('util');
@@ -112,19 +113,6 @@ function onActivated(callback) {
], callback);
}
function setUpdateSuccess(callback) {
tasks.listByTypePaged(tasks.TASK_UPDATE, 1, 1, function (error, results) {
if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, error));
if (results.length !== 1) return callback(); // when hotfixing
tasks.update(results[0].id, { percent: 100, error: null }, function (error) {
if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, error));
callback();
});
});
}
function notifyUpdate(callback) {
assert.strictEqual(typeof callback, 'function');
@@ -134,8 +122,8 @@ function notifyUpdate(callback) {
eventlog.add(eventlog.ACTION_UPDATE_FINISH, auditSource.CRON, { oldVersion: version || 'dev', newVersion: constants.VERSION }, function (error) {
if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, error));
setUpdateSuccess(function (error) {
if (error) return callback(error);
tasks.setCompletedByType(tasks.TASK_UPDATE, { error: null }, function (error) {
if (error && error.reason !== TaskError.NOT_FOUND) return callback(error); // when hotfixing, task may not exist
safe.fs.writeFileSync(paths.VERSION_FILE, constants.VERSION, 'utf8');