Stash logs in crash log directory

src/crashnotifier.js

@@ -0,0 +1,61 @@
+'use strict';
+
+exports = module.exports = {
+    sendFailureLogs: sendFailureLogs
+};
+
+var assert = require('assert'),
+    eventlog = require('./eventlog.js'),
+    safe = require('safetydance'),
+    path = require('path'),
+    paths = require('./paths.js'),
+    util = require('util');
+
+const COLLECT_LOGS_CMD = path.join(__dirname, 'scripts/collectlogs.sh');
+
+const CRASH_LOG_TIMESTAMP_OFFSET = 1000 * 60 * 60; // 60 min
+const CRASH_LOG_TIMESTAMP_FILE = '/tmp/crashlog.timestamp';
+
+const AUDIT_SOURCE = { userId: null, username: 'healthmonitor' };
+
+function collectLogs(unitName, callback) {
+    assert.strictEqual(typeof unitName, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    var logs = safe.child_process.execSync('sudo ' + COLLECT_LOGS_CMD + ' ' + unitName, { encoding: 'utf8' });
+    if (!logs) return callback(safe.error);
+
+    callback(null, logs);
+}
+
+function sendFailureLogs(unitName, callback) {
+    assert.strictEqual(typeof unitName, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    // check if we already sent a mail in the last CRASH_LOG_TIME_OFFSET window
+    const timestamp = safe.fs.readFileSync(CRASH_LOG_TIMESTAMP_FILE, 'utf8');
+    if (timestamp && (parseInt(timestamp) + CRASH_LOG_TIMESTAMP_OFFSET) > Date.now()) {
+        console.log('Crash log already sent within window');
+        return callback();
+    }
+
+    collectLogs(unitName, function (error, logs) {
+        if (error) {
+            console.error('Failed to collect logs.', error);
+            logs = util.format('Failed to collect logs.', error);
+        }
+
+        const crashLogFile = `${new Date().toISOString()}.log`;
+        console.log(`Sending failure logs for ${unitName} at ${crashLogFile}`);
+
+        if (!safe.fs.writeFileSync(path.join(paths.CRASH_LOG_DIR, crashLogFile), logs)) console.log(`Failed to stash logs to ${crashLogFile}:`, safe.error);
+
+        eventlog.add(eventlog.ACTION_PROCESS_CRASH, AUDIT_SOURCE, { processName: unitName, crashLogFile: crashLogFile }, function (error) {
+            if (error) console.log(`Error sending crashlog. Logs stashed at ${crashLogFile}`);
+
+            safe.fs.writeFileSync(CRASH_LOG_TIMESTAMP_FILE, String(Date.now()));
+
+            callback();
+        });
+    });
+}

src/logcollector.js

@@ -1,67 +0,0 @@
-'use strict';
-
-exports = module.exports = {
-    sendFailureLogs: sendFailureLogs
-};
-
-var assert = require('assert'),
-    eventlog = require('./eventlog.js'),
-    safe = require('safetydance'),
-    path = require('path'),
-    paths = require('./paths.js'),
-    util = require('util');
-
-var COLLECT_LOGS_CMD = path.join(__dirname, 'scripts/collectlogs.sh');
-
-var CRASH_LOG_TIMESTAMP_OFFSET = 1000 * 60 * 60; // 60 min
-var CRASH_LOG_TIMESTAMP_FILE = '/tmp/crashlog.timestamp';
-var CRASH_LOG_STASH_FILE = '/tmp/crashlog';
-
-const AUDIT_SOURCE = { userId: null, username: 'healthmonitor' };
-
-function collectLogs(unitName, callback) {
-    assert.strictEqual(typeof unitName, 'string');
-    assert.strictEqual(typeof callback, 'function');
-
-    var logs = safe.child_process.execSync('sudo ' + COLLECT_LOGS_CMD + ' ' + unitName, { encoding: 'utf8' });
-    if (!logs) return callback(safe.error);
-
-    logs = logs + '\n\n=====================================\n\n';
-
-    // special case for box since the real logs are at path.join(paths.LOG_DIR, 'box.log')
-    if (unitName === 'box.service') {
-        logs += safe.child_process.execSync('tail --lines=500 ' + path.join(paths.LOG_DIR, 'box.log'), { encoding: 'utf8' });
-    }
-
-    callback(null, logs);
-}
-
-function sendFailureLogs(unitName) {
-    assert.strictEqual(typeof unitName, 'string');
-
-    collectLogs(unitName, function (error, logs) {
-        if (error) {
-            console.error('Failed to collect logs.', error);
-            logs = util.format('Failed to collect logs.', error);
-        }
-
-        console.log('Sending failure logs for', unitName);
-
-        if (!safe.fs.writeFileSync(CRASH_LOG_STASH_FILE, logs)) console.log(`Failed to stash logs to ${CRASH_LOG_STASH_FILE}`);
-
-        var timestamp = safe.fs.readFileSync(CRASH_LOG_TIMESTAMP_FILE, 'utf8');
-
-        // check if we already sent a mail in the last CRASH_LOG_TIME_OFFSET window
-        if (timestamp && (parseInt(timestamp) + CRASH_LOG_TIMESTAMP_OFFSET) > Date.now()) {
-            console.log('Crash log already sent within window. Stashing logs.');
-            return;
-        }
-
-        eventlog.add(eventlog.ACTION_PROCESS_CRASH, AUDIT_SOURCE, { processName: unitName, crashLogFile: CRASH_LOG_STASH_FILE }, function (error) {
-            if (error) console.log(`Error sending crashlog. Logs stashed at ${CRASH_LOG_STASH_FILE}`);
-
-            // write the new timestamp file and delete stash file
-            safe.fs.writeFileSync(CRASH_LOG_TIMESTAMP_FILE, String(Date.now()));
-        });
-    });
-}

src/notifications.js

@@ -26,6 +26,8 @@ let assert = require('assert'),
     eventlog = require('./eventlog.js'),
     mailer = require('./mailer.js'),
     notificationdb = require('./notificationdb.js'),
+    path = require('path'),
+    paths = require('./paths.js'),
     safe = require('safetydance'),
     users = require('./users.js'),
     util = require('util');
@@ -234,14 +236,14 @@ function processCrash(eventId, processName, crashLogFile) {
     assert.strictEqual(typeof crashLogFile, 'string');
 
     var subject = `${processName} exited unexpectedly`;
-    var crashLogs = safe.fs.readFileSync(crashLogFile, 'utf8') || `No logs found at ${crashLogFile}`;
+    var crashLogs = safe.fs.readFileSync(path.join(paths.CRASH_LOG_DIR, crashLogFile), 'utf8') || `No logs found at ${crashLogFile}`;
 
     // also send us a notification mail
     if (config.provider() === 'caas') mailer.unexpectedExit('support@cloudron.io', subject, crashLogs);
 
     actionForAllAdmins([], function (admin, callback) {
         mailer.unexpectedExit(admin.email, subject, crashLogs);
-        add(admin.id, eventId, subject, 'Detailed logs have been sent to your email address.', callback);
+        add(admin.id, eventId, subject, `The service has been restarted automatically. Crash logs are available [here](/logs.html?crash=${crashLogFile})`, callback);
     }, function (error) {
         if (error) console.error(error);
     });

src/paths.js

@@ -36,6 +36,7 @@ exports = module.exports = {
 
     LOG_DIR: path.join(config.baseDir(), 'platformdata/logs'),
     TASKS_LOG_DIR: path.join(config.baseDir(), 'platformdata/logs/tasks'),
+    CRASH_LOG_DIR: path.join(config.baseDir(), 'platformdata/logs/crash'),
 
     // this pattern is for the cloudron logs API route to work
     BACKUP_LOG_FILE: path.join(config.baseDir(), 'platformdata/logs/backup/app.log'),

src/scripts/collectlogs.sh

@@ -41,3 +41,10 @@ docker ps
 echo
 echo
 docker network inspect cloudron
+echo
+echo
+echo "box"
+echo "---"
+tail --lines=500 /home/yellowtent/platformdata/logs/box.log
+
+