Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-base: accept alternative logread location

Browse source 
* 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 <dev@brenken.org>
(cherry picked from commit 085f3f7809)
This commit is contained in:
Dirk Brenken 2020-03-20 16:11:31 +01:00 committed by Jo-Philipp Wich
parent 9c5408499a
commit c235829326
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
modules/luci-base/root/usr/share/rpcd/acl.d/luci-base.json
View file

@ -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" ],

9
modules/luci-mod-status/htdocs/luci-static/resources/view/status/syslog.js
View file

@ -5,10 +5,17 @@
return view.extend({
load: function() {
return fs.exec_direct('/sbin/logread', [ '-e', '^' ]).catch(function(err) {
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 '';
});
});
},
render: function(logdata) {