From 0c3bd5c537d0a01e9bd95edb60a21b978969b241 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Wed, 24 Jan 2018 16:24:09 +0100 Subject: [PATCH 1/4] luci-app-mwan3: update uci track entry to use /etc/init.d/mwan3 reload Signed-off-by: Florian Eckert --- applications/luci-app-mwan3/root/etc/uci-defaults/60_luci-mwan3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/luci-app-mwan3/root/etc/uci-defaults/60_luci-mwan3 b/applications/luci-app-mwan3/root/etc/uci-defaults/60_luci-mwan3 index 50c65ad678..150ea5a3f1 100755 --- a/applications/luci-app-mwan3/root/etc/uci-defaults/60_luci-mwan3 +++ b/applications/luci-app-mwan3/root/etc/uci-defaults/60_luci-mwan3 @@ -4,7 +4,7 @@ uci -q batch <<-EOF >/dev/null del ucitrack.@mwan3[-1] add ucitrack mwan3 - set ucitrack.@mwan3[-1].exec="/usr/sbin/mwan3 restart" + set ucitrack.@mwan3[-1].exec="/etc/init.d/mwan3 reload" commit ucitrack EOF From 83cec9277da2ec6cfbbec5f6397226aa9a65a964 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Tue, 30 Jan 2018 07:06:55 +0100 Subject: [PATCH 2/4] luci-app-mwan3: do not show mwan3 status in overview if not enabled Signed-off-by: Florian Eckert --- .../luci-app-mwan3/luasrc/view/admin_status/index/mwan.htm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/applications/luci-app-mwan3/luasrc/view/admin_status/index/mwan.htm b/applications/luci-app-mwan3/luasrc/view/admin_status/index/mwan.htm index d76db724bd..e4b3c06999 100644 --- a/applications/luci-app-mwan3/luasrc/view/admin_status/index/mwan.htm +++ b/applications/luci-app-mwan3/luasrc/view/admin_status/index/mwan.htm @@ -1 +1,3 @@ +<%if require("luci.sys").init.enabled("mwan3") then%> <%+mwan/overview_status_interface%> +<%end%> From 4b0347d498a9c779b4ece45b7b28dd6b9ee752ae Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Tue, 30 Jan 2018 07:22:06 +0100 Subject: [PATCH 3/4] luci-app-mwan3: update look and feel interface status page Signed-off-by: Florian Eckert --- .../luasrc/view/mwan/status_interface.htm | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/status_interface.htm b/applications/luci-app-mwan3/luasrc/view/mwan/status_interface.htm index 2fb5ea484f..a796af815e 100644 --- a/applications/luci-app-mwan3/luasrc/view/mwan/status_interface.htm +++ b/applications/luci-app-mwan3/luasrc/view/mwan/status_interface.htm @@ -18,7 +18,9 @@ XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "status", "mwan", "interface_status")%>', null, function(x, status) { - var statusDiv = document.getElementById('mwan_status_text'); + var legend = document.getElementById('diag-rc-legend'); + var statusDiv = document.getElementById('diag-rc-output'); + legend.style.display = 'none'; if (status.interfaces) { var statusview = ''; @@ -62,10 +64,13 @@ ); //]]> -
-
- <%:MWAN status - Interface Live Status%> -
<%:Loading%><%:Collecting data...%>
+
+

<%:MWAN Status - Interface%>

+
+ <%:Collecting data...%> + + <%:Loading%> +
From 66b93ab784ad287142964559eaf9f89cb2fa39df Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Tue, 30 Jan 2018 08:12:53 +0100 Subject: [PATCH 4/4] luci-app-wman3: show info if mwan3 is not global enabled Signed-off-by: Florian Eckert --- .../luci-app-mwan3/luasrc/view/mwan/status_detail.htm | 3 +++ .../luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm | 4 +++- .../luci-app-mwan3/luasrc/view/mwan/status_interface.htm | 3 +++ .../luasrc/view/mwan/status_troubleshooting.htm | 3 +++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/status_detail.htm b/applications/luci-app-mwan3/luasrc/view/mwan/status_detail.htm index b7bb6de1c7..70eac72520 100644 --- a/applications/luci-app-mwan3/luasrc/view/mwan/status_detail.htm +++ b/applications/luci-app-mwan3/luasrc/view/mwan/status_detail.htm @@ -28,6 +28,9 @@

<%:MWAN Status - Detail%>

+ <%if not require("luci.sys").init.enabled("mwan3") then%> +
<%:INFO: MWAN not running%>
+ <%end%>
<%:Collecting data...%> diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm b/applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm index f9a0fa2be4..f1c5d8fd98 100644 --- a/applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm +++ b/applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm @@ -55,7 +55,9 @@

<%:MWAN Status - Diagnostics%>

- + <%if not require("luci.sys").init.enabled("mwan3") then%> +
<%:INFO: MWAN not running%>
+ <%end%>

diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/status_interface.htm b/applications/luci-app-mwan3/luasrc/view/mwan/status_interface.htm index a796af815e..21e59a8017 100644 --- a/applications/luci-app-mwan3/luasrc/view/mwan/status_interface.htm +++ b/applications/luci-app-mwan3/luasrc/view/mwan/status_interface.htm @@ -66,6 +66,9 @@

<%:MWAN Status - Interface%>

+ <%if not require("luci.sys").init.enabled("mwan3") then%> +
<%:INFO: MWAN not running%>
+ <%end%>
<%:Collecting data...%> diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/status_troubleshooting.htm b/applications/luci-app-mwan3/luasrc/view/mwan/status_troubleshooting.htm index b812e5b888..77d009231e 100644 --- a/applications/luci-app-mwan3/luasrc/view/mwan/status_troubleshooting.htm +++ b/applications/luci-app-mwan3/luasrc/view/mwan/status_troubleshooting.htm @@ -28,6 +28,9 @@

<%:MWAN Status - Troubleshooting%>

+ <%if not require("luci.sys").init.enabled("mwan3") then%> +
<%:INFO: MWAN not running%>
+ <%end%>
<%:Collecting data...%>