autocore: 10_system: fix parse data
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
parent
42e2aaf2b3
commit
51225d75e4
|
@ -73,8 +73,8 @@ return baseclass.extend({
|
|||
|
||||
var fields = [
|
||||
_('Hostname'), boardinfo.hostname,
|
||||
_('Model'), boardinfo.model + cpubench,
|
||||
_('Architecture'), cpuinfo,
|
||||
_('Model'), boardinfo.model + cpubench.cpubench,
|
||||
_('Architecture'), cpuinfo.cpuinfo,
|
||||
_('Target Platform'), (L.isObject(boardinfo.release) ? boardinfo.release.target : ''),
|
||||
_('Firmware Version'), (L.isObject(boardinfo.release) ? boardinfo.release.description + ' / ' : '') + (luciversion || ''),
|
||||
_('Kernel Version'), boardinfo.kernel,
|
||||
|
@ -85,7 +85,7 @@ return baseclass.extend({
|
|||
systeminfo.load[1] / 65535.0,
|
||||
systeminfo.load[2] / 65535.0
|
||||
) : null,
|
||||
_('CPU usage (%)'), cpuusage
|
||||
_('CPU usage (%)'), cpuusage.cpuusage
|
||||
];
|
||||
|
||||
var table = E('table', { 'class': 'table' });
|
||||
|
|
|
@ -623,8 +623,9 @@ local methods = {
|
|||
getCPUBench = {
|
||||
call = function()
|
||||
local sys = require "luci.sys"
|
||||
local cpubench = sys.exec("cat /etc/bench.log 2>/dev/null") or ""
|
||||
local cpubench = {}
|
||||
|
||||
cpubench.cpubench = sys.exec("cat /etc/bench.log 2>/dev/null")
|
||||
return cpubench
|
||||
end
|
||||
},
|
||||
|
@ -632,9 +633,11 @@ local methods = {
|
|||
getCPUInfo = {
|
||||
call = function()
|
||||
local sys = require "luci.sys"
|
||||
local cpuinfo = sys.exec("/sbin/cpuinfo")
|
||||
local cpuinfo = {}
|
||||
|
||||
if (cpuinfo == nil) or (cpuinfo == "") then
|
||||
cpuinfo.cpuinfo = sys.exec("/sbin/cpuinfo")
|
||||
|
||||
if (cpuinfo.cpuinfo == nil) or (cpuinfo.cpuinfo == "") then
|
||||
cpuinfo.cpuinfo = "? x ? (2.33MHz, 2.33°C)"
|
||||
end
|
||||
|
||||
|
@ -645,8 +648,9 @@ local methods = {
|
|||
getCPUUsage = {
|
||||
call = function()
|
||||
local sys = require "luci.sys"
|
||||
local cpuusage = sys.exec("top -n1 | awk '/^CPU/ {printf(\"%d%\", 100 - $8)}'") or "6%"
|
||||
local cpuusage = {}
|
||||
|
||||
cpuusage.cpuusage = sys.exec("top -n1 | awk '/^CPU/ {printf(\"%d%\", 100 - $8)}'") or "6%"
|
||||
return cpuusage
|
||||
end
|
||||
},
|
||||
|
|
Loading…
Reference in New Issue
Block a user