a_s_desc = [[Here you can configure the basic aspects of your device like its hostname or the timezone.]]
a_s_packages = [[Software]]
a_s_changepw = [[Admin Password]]
-a_s_p_ipkg = [[<abbr title="Itsy Package Management System">IPKG</abbr>-Configuration]]
+--a_s_p_ipkg = [[<abbr title="Itsy Package Management System">IPKG</abbr>-Configuration]]
+a_s_p_ipkg = [[IPKG-Configuration]]
a_s_sshkeys = [[<abbr title="Secure Shell">SSH</abbr>-Keys]]
a_s_fstab = [[Mount Points]]
a_s_flash = [[Flash Firmware]]
network_interface_err_desc = [[TX / RX]]
network_interface_fwzone = [[Create / Assign firewall-zone]]
network_interface_fwzone_desc = [[This interface does not belong to any firewall zone yet.]]
+
+process_head = "Processes"
+process_descr = "This list gives an overview over currently running system processes and their status."
+process_pid = "PID"
+process_owner = "Owner"
+process_command = "Command"
+process_cpu = "CPU usage (%)"
+process_mem = "Memory usage (%)"
+process_hup = "Hang Up"
+process_term = "Terminate"
+process_kill = "Kill"
\ No newline at end of file
network_interface_err_desc = "TX / RX"
network_interface_fwzone = "Firewallzone anlegen / zuweisen"
-network_interface_fwzone_desc = "Diese Schnittstelle gehört bis jetzt zu keiner Firewallzone."
\ No newline at end of file
+network_interface_fwzone_desc = "Diese Schnittstelle gehört bis jetzt zu keiner Firewallzone."
+
+process_head = "Prozesse"
+process_descr = "Diese Tabelle gibt eine Übersicht über aktuell laufende Systemprozeese und deren Status."
+process_pid = "PID"
+process_owner = "Besitzer"
+process_command = "Befehl"
+process_cpu = "CPU-Nutzung (%)"
+process_mem = "Speichernutzung (%)"
+process_hup = "Auflegen"
+process_term = "Beenden"
+process_kill = "Töten"
\ No newline at end of file
or valid and 1
or -1
- self.dorender = self:handle(state, self.data) ~= false
+ self.dorender = not self.handle or self:handle(state, self.data) ~= false
end
function SimpleForm.render(self, ...)
self.data = data
function datasource.get(self, section, option)
- return data[section][option]
+ return data[section] and data[section][option]
+ end
+
+ function datasource.del(...)
+ return true
end
AbstractSection.__init__(self, datasource, "table", ...)
self.anonymous = true
end
+function Table.parse(self)
+ for i, k in ipairs(self:cfgsections()) do
+ if luci.http.formvalue("cbi.submit") then
+ Node.parse(self, k)
+ end
+ end
+end
+
function Table.cfgsections(self)
local sections = {}
- for i, v in pairs(self.data) do
+ for i, v in luci.util.kspairs(self.data) do
table.insert(sections, i)
end
self.config = map.config
self.tag_invalid = {}
self.tag_missing = {}
+ self.tag_error = {}
self.deps = {}
self.track_missing = false
table.insert(self.deps, {field=field, value=value})
end
+-- Generates the unique CBID
+function AbstractValue.cbid(self, section)
+ return "cbid."..self.map.config.."."..section.."."..self.option
+end
+
-- Return whether this object should be created
function AbstractValue.formcreated(self, section)
local key = "cbi.opt."..self.config.."."..section
-- Returns the formvalue for this object
function AbstractValue.formvalue(self, section)
- local key = "cbid."..self.map.config.."."..section.."."..self.option
- return luci.http.formvalue(key)
+ return luci.http.formvalue(self:cbid(section))
end
function AbstractValue.additional(self, value)
if not self.optional or self:cfgvalue(s) or self:formcreated(s) then
scope = scope or {}
scope.section = s
- scope.cbid = "cbid." .. self.config ..
- "." .. s ..
- "." .. self.option
+ scope.cbid = self:cbid(s)
scope.ifattr = function(cond,key,val)
if cond then
AbstractValue.__init__(self, ...)
self.template = "cbi/tvalue"
end
+
+--[[
+Button
+]]--
+Button = class(AbstractValue)
+
+function Button.__init__(self, ...)
+ AbstractValue.__init__(self, ...)
+ self.template = "cbi/button"
+ self.inputstyle = nil
+ self.rmempty = true
+end
\ No newline at end of file
--- /dev/null
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+<%+cbi/valueheader%>
+ <input<% if self.inputstyle then %> class="cbi-input-<%=self.inputstyle%>"<% end %> type="submit"<%= attr("name", cbid) .. attr("id", cbid) .. attr("value", self.title) %> />
+<%+cbi/valuefooter%>
-%>
- <% if self.tag_invalid[section] then -%>
+ <% if self.tag_error[section] then -%>
+ <div class="cbi-error"><%=self.tag_error[section]%></div>
+ <%- elseif self.tag_invalid[section] then -%>
<div class="cbi-error"><%:cbi_invalid%></div>
+ <%- elseif self.tag_missing[section] then -%>
+ <div class="cbi-error"><%:cbi_missing%></div>
<%- end %>
</td>
</div>
<%- end -%>
- <% if self.tag_invalid[section] then -%>
+ <% if self.tag_error[section] then -%>
+ <div class="cbi-error"><%=self.tag_error[section]%></div>
+ <%- elseif self.tag_invalid[section] then -%>
<div class="cbi-error"><%:cbi_invalid%></div>
- <%- end %>
- <% if self.tag_missing[section] then -%>
+ <%- elseif self.tag_missing[section] then -%>
<div class="cbi-error"><%:cbi_missing%></div>
<%- end %>
+
</div>
<% if #self.deps > 0 then -%>
-- @return Number containing the current pid
process.info = posix.getpid
+--- Retrieve information about currently running processes.
+-- @return Table containing process information
+function process.list()
+ local data = {}
+ local k
+ local ps = luci.util.execi("top -bn1")
+
+ if not ps then
+ return
+ end
+
+ while true do
+ local line = ps()
+ if not line then
+ return
+ end
+
+ k = luci.util.split(luci.util.trim(line), "%s+", nil, true)
+ if k[1] == "PID" then
+ break
+ end
+ end
+
+ for line in ps do
+ local row = {}
+
+ line = luci.util.trim(line)
+ for i, value in ipairs(luci.util.split(line, "%s+", #k-1, true)) do
+ row[k[i]] = value
+ end
+
+ local pid = tonumber(row[k[1]])
+ if pid then
+ data[pid] = row
+ end
+ end
+
+ return data
+end
+
--- Set the gid of a process identified by given pid.
-- @param pid Number containing the process id
-- @param gid Number containing the Unix group id
return posix.setpid("u", pid, uid)
end
+--- Send a signal to a process identified by given pid.
+-- @param pid Number containing the process id
+-- @param sig Signal to send (default: 15 [SIGTERM])
+-- @return Boolean indicating successful operation
+-- @return Number containing the error code if failed
+process.signal = posix.kill
+
--- LuCI system utilities / user related functions.
-- @class module
entry({"admin", "system", "passwd"}, form("admin_system/passwd"), i18n("a_s_changepw"), 20)
entry({"admin", "system", "sshkeys"}, form("admin_system/sshkeys"), i18n("a_s_sshkeys"), 30)
entry({"admin", "system", "system"}, cbi("admin_system/system"), i18n("system"), 40)
+ entry({"admin", "system", "processes"}, form("admin_system/processes"), i18n("process_head"), 45)
entry({"admin", "system", "fstab"}, cbi("admin_system/fstab"), i18n("a_s_fstab"), 50)
entry({"admin", "system", "leds"}, cbi("admin_system/leds"), i18n("leds", "LEDs"), 60)
entry({"admin", "system", "backup"}, call("action_backup"), i18n("a_s_backup"), 70)
-- Package info
- local info = luci.model.ipkg.info(query)
+ local info = luci.model.ipkg.info("*"..query.."*")
info = info or {}
local pkgs = {}
--- /dev/null
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+f = SimpleForm("processes", translate("process_head"), translate("process_descr"))
+f.reset = false
+f.submit = false
+
+t = f:section(Table, luci.sys.process.list())
+t:option(DummyValue, "PID", translate("process_pid"))
+t:option(DummyValue, "USER", translate("process_owner"))
+t:option(DummyValue, "COMMAND", translate("process_command"))
+t:option(DummyValue, "%CPU", translate("process_cpu"))
+t:option(DummyValue, "%MEM", translate("process_mem"))
+
+hup = t:option(Button, "_hup", translate("process_hup"))
+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("process_term"))
+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("process_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
projects / project / luci.git / commitdiff