From 9fcb7d332b1c9b8b00a67241fcbaaf4fc4a8e5bf Mon Sep 17 00:00:00 2001 From: Daniel Nilsson Date: Tue, 23 Apr 2024 21:52:54 +0200 Subject: luci-mod-status: auto-refresh system log and kernel log Signed-off-by: Daniel Nilsson --- .../luci-static/resources/view/status/dmesg.js | 32 ++++++++++++++++------ 1 file changed, 24 insertions(+), 8 deletions(-) (limited to 'modules/luci-mod-status/htdocs/luci-static/resources/view/status/dmesg.js') diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/dmesg.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/dmesg.js index acddf454f5..45b483962d 100644 --- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/dmesg.js +++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/dmesg.js @@ -1,21 +1,37 @@ 'use strict'; 'require view'; 'require fs'; +'require poll'; 'require ui'; return view.extend({ - load: function() { - return fs.exec_direct('/bin/dmesg', [ '-r' ]).catch(function(err) { + retrieveLog: async function() { + return fs.exec_direct('/bin/dmesg', [ '-r' ]).then(logdata => { + const loglines = logdata.trim().split(/\n/).map(function(line) { + return line.replace(/^<\d+>/, ''); + }); + return { value: loglines.join('\n'), rows: loglines.length + 1 }; + }).catch(function(err) { ui.addNotification(null, E('p', {}, _('Unable to load log data: ' + err.message))); return ''; }); }, - render: function(logdata) { - var loglines = logdata.trim().split(/\n/).map(function(line) { - return line.replace(/^<\d+>/, ''); - }); + pollLog: async function() { + const element = document.getElementById('syslog'); + if (element) { + const log = await this.retrieveLog(); + element.value = log.value; + element.rows = log.rows; + } + }, + + load: async function() { + poll.add(this.pollLog.bind(this)); + return await this.retrieveLog(); + }, + render: function(loglines) { var scrollDownButton = E('button', { 'id': 'scrollDownButton', 'class': 'cbi-button cbi-button-neutral', @@ -43,8 +59,8 @@ return view.extend({ 'style': 'font-size:12px', 'readonly': 'readonly', 'wrap': 'off', - 'rows': loglines.length + 1 - }, [ loglines.join('\n') ]), + 'rows': loglines.rows + }, [ loglines.value ]), E('div', {'style': 'padding-bottom: 20px'}, [scrollUpButton]) ]) ]); -- cgit v1.2.3