diff --git a/rootfs/usr/share/www/static/scripts.js b/rootfs/usr/share/www/static/scripts.js index de00e94..dc08a37 100644 --- a/rootfs/usr/share/www/static/scripts.js +++ b/rootfs/usr/share/www/static/scripts.js @@ -70,7 +70,10 @@ function testAvailable() { }, scheduleTry); } -var errorCheck = /^[\d -:]+ERROR(.*)/gm +var errorCheck = /^[\d -:]+(ERROR|CRITICAL)(.*)/gm + +const regexRemoveTimestamp = /^[\[\d \-:.\]]*/gm +const regexColorLines = /^(DEBUG|INFO|WARNING|ERROR|CRITICAL)\s\(\w+\)\s(.*)\n/gm function fetchLogs() { fetch("/observer/logs").then(function (res) { @@ -87,8 +90,8 @@ function fetchLogs() { } var scrolledDown = logElement.scrollTop + logElement.clientHeight === logElement.scrollHeight; logElement.innerHTML = text - .replace(/^[\[\d \-:.\]]*/gm, "") - .replace(/^(INFO|WARNING|ERROR)\s\(\w+\)\s(.*)\n/gm, "$2\n") + .replace(regexRemoveTimestamp, "") + .replace(regexColorLines, "$2\n") if (scrolledDown) { // Scroll content down if it was already scrolled down logElement.scrollTop = logElement.scrollHeight; diff --git a/rootfs/usr/share/www/static/styles.css b/rootfs/usr/share/www/static/styles.css index 9de8f03..6e99914 100644 --- a/rootfs/usr/share/www/static/styles.css +++ b/rootfs/usr/share/www/static/styles.css @@ -348,11 +348,15 @@ pre:empty { display: none; } -pre .INFO { +pre .DEBUG { color: #039be5; } -pre .ERROR { +pre .INFO { + color: #43a047; +} + +pre .ERROR, pre .CRITICAL { color: #db4437; }