link to logs instead of spatch'ed error

This commit is contained in:
Girish Ramakrishnan
2019-03-04 17:52:31 -08:00
parent 6fd1205681
commit 1bcc2d544a
3 changed files with 7 additions and 5 deletions
+2 -2
View File
@@ -1017,9 +1017,9 @@ function startBackupTask(auditSource, callback) {
task.on('finish', (error, result) => {
locker.unlock(locker.OP_FULL_BACKUP);
const errorMessage = error ? util.inspect(result, { depth: 10, showHidden: true }) : '';
const errorMessage = error ? error.message : '';
eventlog.add(eventlog.ACTION_BACKUP_FINISH, auditSource, { errorMessage: errorMessage, backupId: result });
eventlog.add(eventlog.ACTION_BACKUP_FINISH, auditSource, { taskId: task.id, errorMessage: errorMessage, backupId: result });
});
}
+4 -3
View File
@@ -275,14 +275,15 @@ function certificateRenewalError(eventId, vhost, errorMessage, callback) {
}, callback);
}
function backupFailed(eventId, errorMessage, callback) {
function backupFailed(eventId, taskId, errorMessage, callback) {
assert.strictEqual(typeof eventId, 'string');
assert.strictEqual(typeof taskId, 'string');
assert.strictEqual(typeof errorMessage, 'string');
assert.strictEqual(typeof callback, 'function');
actionForAllAdmins([], function (admin, callback) {
mailer.backupFailed(errorMessage);
add(admin.id, eventId, 'Failed to backup', `Backup failed: ${errorMessage}. Will be retried in 4 hours`, callback);
add(admin.id, eventId, 'Failed to backup', `Backup failed: ${errorMessage}. Logs are available [here](/logs.html?taskId=${taskId}). Will be retried in 4 hours`, callback);
}, callback);
}
@@ -346,7 +347,7 @@ function onEvent(id, action, source, data, callback) {
case eventlog.ACTION_CERTIFICATE_NEW:
return data.errorMessage ? certificateRenewalError(id, data.domain, data.errorMessage, callback): callback();
case eventlog.ACTION_BACKUP_FINISH: return data.errorMessage ? backupFailed(id, data.errorMessage, callback) : callback();
case eventlog.ACTION_BACKUP_FINISH: return data.errorMessage ? backupFailed(id, data.taskId, data.errorMessage, callback) : callback();
default: return callback();
}
+1
View File
@@ -137,6 +137,7 @@ function startTask(type, args) {
});
});
events.id = taskId;
events.emit('start', taskId);
});