From 734442a10b4470dab6e41214592f7b7870c27f83 Mon Sep 17 00:00:00 2001 From: Christian Korber Date: Wed, 3 Jul 2024 13:55:43 +0200 Subject: luci-mod-status: display log_file in status if defined Commit includes wrapper syslog in /usr/libexec. If a log file is configured, the output of this file is displayed. Otherwise the output of logread is displayed. Signed-off-by: Christian Korber --- .../htdocs/luci-static/resources/view/status/syslog.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'modules/luci-mod-status/htdocs/luci-static/resources/view/status') diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/syslog.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/syslog.js index 2aa3c46093..83a42cdbbf 100644 --- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/syslog.js +++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/syslog.js @@ -7,12 +7,11 @@ return view.extend({ retrieveLog: async function() { return Promise.all([ - L.resolveDefault(fs.stat('/sbin/logread'), null), - L.resolveDefault(fs.stat('/usr/sbin/logread'), null) + L.resolveDefault(fs.stat('/usr/libexec/syslog-wrapper'), null) ]).then(function(stat) { - var logger = stat[0] ? stat[0].path : stat[1] ? stat[1].path : null; + var logger = stat[0].path; - return fs.exec_direct(logger, [ '-e', '^' ]).then(logdata => { + return fs.exec_direct(logger).then(logdata => { const loglines = logdata.trim().split(/\n/); return { value: loglines.join('\n'), rows: loglines.length + 1 }; }).catch(function(err) { -- cgit v1.2.3