From c235829326ae605f5f963231f8cc055e75767b4f Mon Sep 17 00:00:00 2001 From: Dirk Brenken Date: Fri, 20 Mar 2020 16:11:31 +0100 Subject: [PATCH] luci-base: accept alternative logread location * minimal change to accept the usual logread location plus the alternative location (/usr/sbin/logread) used by syslog-ng (see openwrt/packages/issues/11535 for reference) Signed-off-by: Dirk Brenken (cherry picked from commit 085f3f7809daae9a239214d6324557eb6295dc1e) --- .../root/usr/share/rpcd/acl.d/luci-base.json | 1 + .../luci-static/resources/view/status/syslog.js | 13 ++++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/modules/luci-base/root/usr/share/rpcd/acl.d/luci-base.json b/modules/luci-base/root/usr/share/rpcd/acl.d/luci-base.json index 1f5b26f8d..8b8481b1c 100644 --- a/modules/luci-base/root/usr/share/rpcd/acl.d/luci-base.json +++ b/modules/luci-base/root/usr/share/rpcd/acl.d/luci-base.json @@ -49,6 +49,7 @@ "/sbin/ip -6 neigh show": [ "exec" ], "/sbin/ip -6 route show table all": [ "exec" ], "/sbin/logread -e ^": [ "exec" ], + "/usr/sbin/logread -e ^": [ "exec" ], "/usr/bin/ping *": [ "exec" ], "/usr/bin/ping6 *": [ "exec" ], "/usr/bin/traceroute *": [ "exec" ], 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 145a632e6..2bd29194d 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 @@ -5,9 +5,16 @@ return view.extend({ load: function() { - return fs.exec_direct('/sbin/logread', [ '-e', '^' ]).catch(function(err) { - ui.addNotification(null, E('p', {}, _('Unable to load log data: ' + err.message))); - return ''; + return Promise.all([ + L.resolveDefault(fs.stat('/sbin/logread'), null), + L.resolveDefault(fs.stat('/usr/sbin/logread'), null) + ]).then(function(stat) { + var logger = stat[0] ? stat[0].path : stat[1] ? stat[1].path : null; + + return fs.exec_direct(logger, [ '-e', '^' ]).catch(function(err) { + ui.addNotification(null, E('p', {}, _('Unable to load log data: ' + err.message))); + return ''; + }); }); }, -- 2.25.1