X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fcontroller%2Fadmin%2Fstatus.lua;h=3b23055157400514b78e21ff22b94581fd2c4fcd;hp=c6257ad73134edd0aeb0db7b7e2f41c10fc37dd3;hb=2bc02e44b41ffbfcc0ccad59d09409b6bee5bbef;hpb=1bce159bb138f02a4eac4002b533020e692b4fd7 diff --git a/modules/admin-full/luasrc/controller/admin/status.lua b/modules/admin-full/luasrc/controller/admin/status.lua index c6257ad73..3b2305515 100644 --- a/modules/admin-full/luasrc/controller/admin/status.lua +++ b/modules/admin-full/luasrc/controller/admin/status.lua @@ -12,27 +12,32 @@ You may obtain a copy of the License at $Id$ ]]-- + module("luci.controller.admin.status", package.seeall) function index() - luci.i18n.loadc("base") - local i18n = luci.i18n.translate + local function _(x) return x end - entry({"admin", "status"}, alias("admin", "status", "interfaces"), i18n("Status"), 20).index = true - entry({"admin", "status", "overview"}, template("admin_status/index"), i18n("Overview"), 1) - entry({"admin", "status", "iptables"}, call("action_iptables"), i18n("Firewall"), 2).leaf = true - entry({"admin", "status", "routes"}, template("admin_status/routes"), i18n("Routes"), 3) - entry({"admin", "status", "syslog"}, call("action_syslog"), i18n("System Log"), 4) - entry({"admin", "status", "dmesg"}, call("action_dmesg"), i18n("Kernel Log"), 5) + entry({"admin", "status"}, alias("admin", "status", "overview"), _("Status"), 20).index = true + entry({"admin", "status", "overview"}, template("admin_status/index"), _("Overview"), 1) + entry({"admin", "status", "iptables"}, call("action_iptables"), _("Firewall"), 2).leaf = true + entry({"admin", "status", "routes"}, template("admin_status/routes"), _("Routes"), 3) + entry({"admin", "status", "syslog"}, call("action_syslog"), _("System Log"), 4) + entry({"admin", "status", "dmesg"}, call("action_dmesg"), _("Kernel Log"), 5) - entry({"admin", "status", "load"}, template("admin_status/load"), i18n("Realtime Load"), 6).leaf = true + entry({"admin", "status", "load"}, template("admin_status/load"), _("Realtime Load"), 6).leaf = true entry({"admin", "status", "load_status"}, call("action_load")).leaf = true - entry({"admin", "status", "bandwidth"}, template("admin_status/bandwidth"), i18n("Realtime Traffic"), 7).leaf = true + entry({"admin", "status", "bandwidth"}, template("admin_status/bandwidth"), _("Realtime Traffic"), 7).leaf = true entry({"admin", "status", "bandwidth_status"}, call("action_bandwidth")).leaf = true - entry({"admin", "status", "connections"}, template("admin_status/connections"), i18n("Realtime Connections"), 8).leaf = true + entry({"admin", "status", "wireless"}, template("admin_status/wireless"), _("Realtime Wireless"), 8).leaf = true + entry({"admin", "status", "wireless_status"}, call("action_wireless")).leaf = true + + entry({"admin", "status", "connections"}, template("admin_status/connections"), _("Realtime Connections"), 9).leaf = true entry({"admin", "status", "connections_status"}, call("action_connections")).leaf = true + + entry({"admin", "status", "processes"}, cbi("admin_status/processes"), _("Processes"), 20) end function action_syslog() @@ -69,57 +74,63 @@ function action_bandwidth() local path = luci.dispatcher.context.requestpath local iface = path[#path] - local fs = require "luci.fs" - if fs.access("/var/lib/luci-bwc/if/%s" % iface) then - luci.http.prepare_content("application/json") - - local bwc = io.popen("luci-bwc -i %q 2>/dev/null" % iface) - if bwc then - luci.http.write("[") + luci.http.prepare_content("application/json") - while true do - local ln = bwc:read("*l") - if not ln then break end - luci.http.write(ln) - end + local bwc = io.popen("luci-bwc -i %q 2>/dev/null" % iface) + if bwc then + luci.http.write("[") - luci.http.write("]") - bwc:close() + while true do + local ln = bwc:read("*l") + if not ln then break end + luci.http.write(ln) end - return + luci.http.write("]") + bwc:close() end +end + +function action_wireless() + local path = luci.dispatcher.context.requestpath + local iface = path[#path] + + luci.http.prepare_content("application/json") - luci.http.status(404, "No data available") + local bwc = io.popen("luci-bwc -r %q 2>/dev/null" % iface) + if bwc then + luci.http.write("[") + + while true do + local ln = bwc:read("*l") + if not ln then break end + luci.http.write(ln) + end + + luci.http.write("]") + bwc:close() + end end function action_load() - local fs = require "luci.fs" - if fs.access("/var/lib/luci-bwc/load") then - luci.http.prepare_content("application/json") - - local bwc = io.popen("luci-bwc -l 2>/dev/null") - if bwc then - luci.http.write("[") - - while true do - local ln = bwc:read("*l") - if not ln then break end - luci.http.write(ln) - end - - luci.http.write("]") - bwc:close() + luci.http.prepare_content("application/json") + + local bwc = io.popen("luci-bwc -l 2>/dev/null") + if bwc then + luci.http.write("[") + + while true do + local ln = bwc:read("*l") + if not ln then break end + luci.http.write(ln) end - return + luci.http.write("]") + bwc:close() end - - luci.http.status(404, "No data available") end function action_connections() - local fs = require "luci.fs" local sys = require "luci.sys" luci.http.prepare_content("application/json") @@ -127,20 +138,18 @@ function action_connections() luci.http.write("{ connections: ") luci.http.write_json(sys.net.conntrack()) - if fs.access("/var/lib/luci-bwc/connections") then - local bwc = io.popen("luci-bwc -c 2>/dev/null") - if bwc then - luci.http.write(", statistics: [") + local bwc = io.popen("luci-bwc -c 2>/dev/null") + if bwc then + luci.http.write(", statistics: [") - while true do - local ln = bwc:read("*l") - if not ln then break end - luci.http.write(ln) - end - - luci.http.write("]") - bwc:close() + while true do + local ln = bwc:read("*l") + if not ln then break end + luci.http.write(ln) end + + luci.http.write("]") + bwc:close() end luci.http.write(" }")