summaryrefslogtreecommitdiffhomepage
path: root/modules/luci-mod-status/luasrc
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2019-11-03 20:07:58 +0100
committerJo-Philipp Wich <jo@mein.io>2019-11-03 20:07:58 +0100
commita43b1c6468e8fd931c721e83f9f18955509cfdaa (patch)
tree39e2adfcd6d8d35be67ea656d1ad3629d3642880 /modules/luci-mod-status/luasrc
parent8d512f13ec722d623ece201c89c806dabbe3bd14 (diff)
luci-base, luci-mod-status: convert process status to client side view
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'modules/luci-mod-status/luasrc')
-rw-r--r--modules/luci-mod-status/luasrc/controller/admin/status.lua2
-rw-r--r--modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua34
2 files changed, 1 insertions, 35 deletions
diff --git a/modules/luci-mod-status/luasrc/controller/admin/status.lua b/modules/luci-mod-status/luasrc/controller/admin/status.lua
index e888ccf097..6f84149223 100644
--- a/modules/luci-mod-status/luasrc/controller/admin/status.lua
+++ b/modules/luci-mod-status/luasrc/controller/admin/status.lua
@@ -16,7 +16,7 @@ function index()
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", "processes"}, form("admin_status/processes"), _("Processes"), 6)
+ entry({"admin", "status", "processes"}, view("status/processes"), _("Processes"), 6)
entry({"admin", "status", "realtime"}, alias("admin", "status", "realtime", "load"), _("Realtime Graphs"), 7)
diff --git a/modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua b/modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua
deleted file mode 100644
index 0a6e48fd8e..0000000000
--- a/modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua
+++ /dev/null
@@ -1,34 +0,0 @@
--- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
--- Licensed to the public under the Apache License 2.0.
-
-f = SimpleForm("processes", translate("Processes"), translate("This list gives an overview over currently running system processes and their status."))
-f.reset = false
-f.submit = false
-
-t = f:section(Table, luci.sys.process.list())
-t:option(DummyValue, "PID", translate("PID"))
-t:option(DummyValue, "USER", translate("Owner"))
-t:option(DummyValue, "COMMAND", translate("Command"))
-t:option(DummyValue, "%CPU", translate("CPU usage (%)"))
-t:option(DummyValue, "%MEM", translate("Memory usage (%)"))
-
-hup = t:option(Button, "_hup", translate("Hang Up"))
-hup.inputstyle = "reload"
-function hup.write(self, section)
- null, self.tag_error[section] = luci.sys.process.signal(section, 1)
-end
-
-term = t:option(Button, "_term", translate("Terminate"))
-term.inputstyle = "remove"
-function term.write(self, section)
- null, self.tag_error[section] = luci.sys.process.signal(section, 15)
-end
-
-kill = t:option(Button, "_kill", translate("Kill"))
-kill.inputstyle = "reset"
-function kill.write(self, section)
- null, self.tag_error[section] = luci.sys.process.signal(section, 9)
-end
-
-return f \ No newline at end of file