diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2020-04-08 09:19:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-08 09:19:09 +0200 |
| commit | 5fe88f8cafc565a68bcba4cea51879a52ea69a65 (patch) | |
| tree | 0a7474f33d5366c703251af9856c9bb28a38efd3 /modules | |
| parent | e331e32b2cd28f98ada2a7c4134ea0b77b9558f0 (diff) | |
| parent | 085f3f7809daae9a239214d6324557eb6295dc1e (diff) | |
Merge pull request #3769 from dibdot/logread-fix
luci-base: accept alternative logread location
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/luci-base/root/usr/share/rpcd/acl.d/luci-base.json | 1 | ||||
| -rw-r--r-- | modules/luci-mod-status/htdocs/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 1f5b26f8d6..8b8481b1cb 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 145a632e62..2bd29194d2 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 ''; + }); }); }, |