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

notifications: better oom message for redis

Browse Source 
fixes #795
This commit is contained in:
Girish Ramakrishnan
2021-09-19 17:32:48 -07:00
parent 05b4f96854
commit 50c68cd499
3 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/notifications.js
View File

@@ -120,21 +120,25 @@ async function list(filters, page, perPage) {
return results;
}
async function oomEvent(eventId, app, addon, containerId /*, event*/) {
async function oomEvent(eventId, containerId, app, addonName /*, event*/) {
assert.strictEqual(typeof eventId, 'string');
assert.strictEqual(typeof app, 'object');
assert.strictEqual(typeof addon, 'object');
assert.strictEqual(typeof containerId, 'string');
assert.strictEqual(typeof app, 'object');
assert(addonName === null || typeof addonName === 'string');
assert(app || addon);
assert(app || addonName);
let title, message;
if (app) {
title = `The application at ${app.fqdn} ran out of memory.`;
message = `The application has been restarted automatically. If you see this notification often, consider increasing the [memory limit](${settings.dashboardOrigin()}/#/app/${app.id}/resources)`;
} else if (addon) {
title = `The ${addon.name} service ran out of memory`;
if (addonName) {
if (app) {
title = `The ${addonName} service of the app at ${app.fqdn} ran out of memory`;
} else {
title = `The ${addonName} service ran out of memory`;
}
message = `The service has been restarted automatically. If you see this notification often, consider increasing the [memory limit](${settings.dashboardOrigin()}/#/services)`;
} else if (app) {
title = `The app at ${app.fqdn} ran out of memory.`;
message = `The app has been restarted automatically. If you see this notification often, consider increasing the [memory limit](${settings.dashboardOrigin()}/#/app/${app.id}/resources)`;
}
await add(eventId, title, message);
@@ -247,7 +251,7 @@ async function onEvent(id, action, source, data) {
switch (action) {
case eventlog.ACTION_APP_OOM:
return await oomEvent(id, data.app, data.addon, data.containerId, data.event);
return await oomEvent(id, data.containerId, data.app, data.addonName, data.event);
case eventlog.ACTION_APP_UPDATE_FINISH:
if (source.username !== auditSource.CRON.username) return; // updated by user