From 510fde01188d1a9a903c2d56b83f498a1e6666b8 Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Sat, 16 Aug 2008 23:17:50 +0000 Subject: Added status information Minor Cleanups --- .../luasrc/model/cbi/admin_system/system.lua | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'modules/admin-full/luasrc/model') diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/system.lua b/modules/admin-full/luasrc/model/cbi/admin_system/system.lua index 6cc5c495fd..9967ce933a 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_system/system.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_system/system.lua @@ -12,12 +12,40 @@ You may obtain a copy of the License at $Id$ ]]-- require("luci.http.protocol.date") +require("luci.sys") +require("luci.tools.webadmin") m = Map("system", translate("system"), translate("a_s_desc")) s = m:section(TypedSection, "system", "") s.anonymous = true +local system, model, memtotal, memcached, membuffers, memfree = luci.sys.sysinfo() +local uptime = luci.sys.uptime() + +s:option(DummyValue, "_system", translate("system")).value = system +s:option(DummyValue, "_cpu", translate("m_i_processor")).value = model + +local load1, load5, load15 = luci.sys.loadavg() +s:option(DummyValue, "_la", translate("load")).value = + string.format("%.2f, %.2f, %.2f", load1, load5, load15) + +s:option(DummyValue, "_memtotal", translate("m_i_memory")).value = + string.format("%.2f MB (%.0f%% %s, %.0f%% %s, %.0f%% %s)", + tonumber(memtotal) / 1024, + 100 * memcached / memtotal, + translate("mem_cached") or "", + 100 * membuffers / memtotal, + translate("mem_buffered") or "", + 100 * memfree / memtotal, + translate("mem_free") or "") + +s:option(DummyValue, "_systime", translate("m_i_systemtime")).value = + os.date("%c") + +s:option(DummyValue, "_uptime", translate("m_i_uptime")).value = + luci.tools.webadmin.date_format(tonumber(uptime)) + s:option(Value, "hostname", translate("hostname")) tz = s:option(ListValue, "timezone", translate("timezone")) -- cgit v1.2.3