From 31ea36f7ab8319313317f9420b47f29812977850 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sun, 2 Oct 2011 10:23:32 +0000 Subject: [PATCH] applications/luci-multiwan: add status indicators, patch by Etienne Champetier (#260) --- .../luci-multiwan/luasrc/controller/multiwan.lua | 44 ++++++++++++++ .../luasrc/view/admin_status/index/multiwan.htm | 1 + .../luci-multiwan/luasrc/view/multiwan_status.htm | 71 ++++++++++++++++++++++ 3 files changed, 116 insertions(+) create mode 100644 applications/luci-multiwan/luasrc/view/admin_status/index/multiwan.htm create mode 100644 applications/luci-multiwan/luasrc/view/multiwan_status.htm diff --git a/applications/luci-multiwan/luasrc/controller/multiwan.lua b/applications/luci-multiwan/luasrc/controller/multiwan.lua index 2a45c5f7b..6aa4cf454 100644 --- a/applications/luci-multiwan/luasrc/controller/multiwan.lua +++ b/applications/luci-multiwan/luasrc/controller/multiwan.lua @@ -11,8 +11,52 @@ function index() page = entry({"admin", "network", "multiwan"}, cbi("multiwan/multiwan"), _("Multi-WAN")) page.i18n = "multiwan" page.dependent = true + + entry({"admin", "network", "multiwan", "status"}, call("multiwan_status")) page = entry({"mini", "network", "multiwan"}, cbi("multiwan/multiwanmini", {autoapply=true}), _("Multi-WAN")) page.i18n = "multiwan" page.dependent = true end +function multiwan_status() + local nfs = require "nixio.fs" + local cachefile = "/tmp/.mwan/cache" + + local rv = { } + + cachefile = nfs.readfile(cachefile) + if cachefile then + local ntm = require "luci.model.network".init() + _, _, wan_if_map = string.find(cachefile, "wan_if_map=\"([^\"]*)\"") + _, _, wan_fail_map = string.find(cachefile, "wan_fail_map=\"([^\"]*)\"") + _, _, wan_recovery_map = string.find(cachefile, "wan_recovery_map=\"([^\"]*)\"") + + rv.wans = { } + wansid = {} + + for wanname, wanifname in string.gfind(wan_if_map, "([^%[]+)%[([^%]]+)%]") do + local wanlink = ntm:get_interface(wanifname) + wanlink = wanlink and wanlink:get_network() + wanlink = wanlink and wanlink:adminlink() or "#" + wansid[wanname] = #rv.wans + 1 + rv.wans[wansid[wanname]] = { name = wanname, link = wanlink, ifname = wanifname, status = "ok", count = 0 } + end + + for wanname, failcount in string.gfind(wan_fail_map, "([^%[]+)%[([^%]]+)%]") do + if failcount == "x" then + rv.wans[wansid[wanname]].status = "ko" + else + rv.wans[wansid[wanname]].status = "failing" + rv.wans[wansid[wanname]].count = failcount + end + end + + for wanname, recoverycount in string.gfind(wan_recovery_map, "([^%[]+)%[([^%]]+)%]") do + rv.wans[wansid[wanname]].status = "recovering" + rv.wans[wansid[wanname]].count = recoverycount + end + end + + luci.http.prepare_content("application/json") + luci.http.write_json(rv) +end diff --git a/applications/luci-multiwan/luasrc/view/admin_status/index/multiwan.htm b/applications/luci-multiwan/luasrc/view/admin_status/index/multiwan.htm new file mode 100644 index 000000000..79c04539f --- /dev/null +++ b/applications/luci-multiwan/luasrc/view/admin_status/index/multiwan.htm @@ -0,0 +1 @@ +<%+multiwan_status%> diff --git a/applications/luci-multiwan/luasrc/view/multiwan_status.htm b/applications/luci-multiwan/luasrc/view/multiwan_status.htm new file mode 100644 index 000000000..8c4127b23 --- /dev/null +++ b/applications/luci-multiwan/luasrc/view/multiwan_status.htm @@ -0,0 +1,71 @@ + + + + +
+ <%:Multi-WAN Status%> +
<%:Collecting data...%>
+
-- 2.11.0