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

Use eventlog directly for apptask crashes

Browse Source
This commit is contained in:
Johannes Zellner
2019-01-19 13:23:18 +01:00
parent 5a6b8222df
commit ed7a7bc879
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/taskmanager.js
+3 -3
View File
@@ -23,7 +23,7 @@ var appdb = require('./appdb.js'),
mkdirp = require('mkdirp'),
path = require('path'),
paths = require('./paths.js'),
sendFailureLogs = require('./logcollector.js').sendFailureLogs,
eventlog = require('./eventlog.js'),
util = require('util'),
_ = require('underscore');
@@ -150,10 +150,10 @@ function startAppTask(appId, callback) {
debug('Task for %s pid %s completed with status %s', appId, pid, code);
if (code === null /* signal */ || (code !== 0 && code !== 50)) { // apptask crashed
debug('Apptask crashed with code %s and signal %s', code, signal);
sendFailureLogs('apptask', { unit: 'box' });
appdb.update(appId, { installationState: appdb.ISTATE_ERROR, installationProgress: 'Apptask crashed with code ' + code + ' and signal ' + signal }, NOOP_CALLBACK);
eventlog.add(eventlog.ACTION_APP_TASK_CRASH, { appId: appId }, { crashLogFile: logFilePath }, NOOP_CALLBACK);
} else if (code === 50) {
sendFailureLogs('apptask', { unit: 'box' });
eventlog.add(eventlog.ACTION_APP_TASK_CRASH, { appId: appId }, { crashLogFile: logFilePath }, NOOP_CALLBACK);
}
delete gActiveTasks[appId];
locker.unlock(locker.OP_APPTASK); // unlock event will trigger next task