From: Jo-Philipp Wich <jo@mein.io>
Date: Wed, 8 Apr 2020 07:19:09 +0000 (+0200)
Subject: Merge pull request #3769 from dibdot/logread-fix
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5fe88f8cafc565a68bcba4cea51879a52ea69a65;p=oweals%2Fluci.git

Merge pull request #3769 from dibdot/logread-fix

luci-base: accept alternative logread location
---

5fe88f8cafc565a68bcba4cea51879a52ea69a65
diff --cc modules/luci-mod-status/htdocs/luci-static/resources/view/status/syslog.js
index 145a632e6,8396157cd..2bd29194d
--- 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
@@@ -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 '';
+ 			});
  		});
  	},