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

Merge pull request #3769 from dibdot/logread-fix

Browse source 
luci-base: accept alternative logread location
This commit is contained in:
Jo-Philipp Wich 2020-04-08 09:19:09 +02:00 committed by GitHub
commit 5fe88f8caf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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 neigh show": [ "exec" ],
"/sbin/ip -6 route show table all": [ "exec" ], "/sbin/ip -6 route show table all": [ "exec" ],
"/sbin/logread -e ^": [ "exec" ], "/sbin/logread -e ^": [ "exec" ],
"/usr/sbin/logread -e ^": [ "exec" ],
"/usr/bin/ping *": [ "exec" ], "/usr/bin/ping *": [ "exec" ],
"/usr/bin/ping6 *": [ "exec" ], "/usr/bin/ping6 *": [ "exec" ],
"/usr/bin/traceroute *": [ "exec" ], "/usr/bin/traceroute *": [ "exec" ],

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

@ -5,9 +5,16 @@
return view.extend({ return view.extend({
load: function() { load: function() {
return fs.exec_direct('/sbin/logread', [ '-e', '^' ]).catch(function(err) { return Promise.all([
ui.addNotification(null, E('p', {}, _('Unable to load log data: ' + err.message))); L.resolveDefault(fs.stat('/sbin/logread'), null),
return ''; 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 '';
});
}); });
}, },