Merge pull request #3769 from dibdot/logread-fix
authorJo-Philipp Wich <jo@mein.io>
Wed, 8 Apr 2020 07:19:09 +0000 (09:19 +0200)
committerGitHub <noreply@github.com>
Wed, 8 Apr 2020 07:19:09 +0000 (09:19 +0200)
luci-base: accept alternative logread location

1  2 
modules/luci-mod-status/htdocs/luci-static/resources/view/status/syslog.js

index 145a632e62acc8a87d5c58ed7278b0824bbd78b8,8396157cd811b7bc697c26180db5ecd54e3d5d88..2bd29194d25e2fa43077c6d049c974ba669284df
@@@ -3,11 -2,18 +3,18 @@@
  'require fs';
  'require ui';
  
 -return L.view.extend({
 +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 '';
+                       });
                });
        },