Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-0.10: Merge r6981

Browse source
This commit is contained in:
Manuel Munz 2011-04-04 12:06:01 +00:00
parent 3490606f2a
commit f27b174f60
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/freifunk/luasrc/controller/freifunk/freifunk.lua
View file

@ -293,7 +293,7 @@ function public_status_json()
end
rv[#rv+1] = {
time = os.date("%a, %d %b %Y %H:%M:%S UTC"),
time = os.date("%a, %d %b %Y, %H:%M:%S"),
uptime = twa.date_format(tonumber(sys.uptime())),
load = string.format("%.2f, %.2f, %.2f", load1, load5, load15),
mem = mem,

2
modules/freifunk/luasrc/view/freifunk/public_status.htm
View file

@ -6,7 +6,7 @@ local twa = require "luci.tools.webadmin"
-- System
local system, model, memtotal, memcached, membuffers, memfree, bogomips = sys.sysinfo()
local uptime = twa.date_format(tonumber(sys.uptime()))
local_time = os.date("%a, %d %b %Y %H:%M:%S UTC")
local_time = os.date("%a, %d %b %Y, %H:%M:%S")
local load1, load5, load15 = sys.loadavg()
local load = string.format("%.2f, %.2f, %.2f", load1, load5, load15)