From 1dac8b797ce5404759c2b105c8d2292b22727d2e Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 10 Oct 2012 02:41:27 +0200 Subject: [PATCH] gatewayd: beef up browse.html a bit --- src/journal/browse.html | 71 ++++++++++++++++++++++++++++------------- 1 file changed, 49 insertions(+), 22 deletions(-) diff --git a/src/journal/browse.html b/src/journal/browse.html index b901d7a908..5ceca26a5d 100644 --- a/src/journal/browse.html +++ b/src/journal/browse.html @@ -4,7 +4,7 @@ Journal @@ -49,7 +64,7 @@
-
+
@@ -196,8 +211,7 @@ (event.currentTarget.status != 200 && event.currentTarget.status != 0)) return; - var logs = document.getElementById("logs"); - logs.innerHTML = ""; + var logs = document.getElementById("tablelogs"); var lc = null; var fc = null; @@ -206,10 +220,12 @@ var l = event.currentTarget.responseText.split('\n'); if (l.length <= 1) { - logs.innerHTML = "No further entries..."; + logs.innerHTML = 'No further entries...'; return; } + var buf = ''; + for (i in l) { if (l[i] == '') @@ -230,34 +246,45 @@ priority = 6; if (priority <= 3) - clazz = "log-error"; + clazz = "message-error"; else if (priority <= 5) - clazz = "log-highlight"; + clazz = "message-highlight"; else - clazz = "log-normal"; + clazz = "message"; - var line = '
'; + buf += ''; + + if (d.__REALTIME_TIMESTAMP != undefined) { + var timestamp = new Date(parseInt(d.__REALTIME_TIMESTAMP) / 1000); + buf += timestamp.toLocaleString(); + } + + buf += ''; if (d.SYSLOG_IDENTIFIER != undefined) - line += d.SYSLOG_IDENTIFIER; + buf += d.SYSLOG_IDENTIFIER; else if (d._COMM != undefined) - line += d._COMM; + buf += d._COMM; if (d._PID != undefined) - line += "[" + d._PID + "]"; + buf += "[" + d._PID + "]"; else if (d.SYSLOG_PID != undefined) - line += "[" + d.SYSLOG_PID + "]"; + buf += "[" + d.SYSLOG_PID + "]"; + + buf += ''; if (d.MESSAGE == null) - line += ": [blob data]
"; + buf += "[blob data]"; else if (d.MESSAGE instanceof Array) - line += ": [" + formatBytes(d.MESSAGE.length) + " blob data]"; + buf += "[" + formatBytes(d.MESSAGE.length) + " blob data]"; else - line += ": " + d.MESSAGE + ""; + buf += d.MESSAGE; - logs.innerHTML += line; + buf += ''; } + logs.innerHTML = buf + ''; + if (fc != null) first_cursor = fc; if (lc != null)