Revert "Update 10_system.js"
This reverts commit dbcc6ca09d45d82cb68392a6a76df1e4997be888.
This commit is contained in:
parent
dbcc6ca09d
commit
95c3126773
@ -23,6 +23,11 @@ var callCPUInfo = rpc.declare({
|
||||
method: 'getCPUInfo'
|
||||
});
|
||||
|
||||
var callCPUUsage = rpc.declare({
|
||||
object: 'luci',
|
||||
method: 'getCPUUsage'
|
||||
});
|
||||
|
||||
var callTempInfo = rpc.declare({
|
||||
object: 'luci',
|
||||
method: 'getTempInfo'
|
||||
@ -37,6 +42,7 @@ return baseclass.extend({
|
||||
L.resolveDefault(callSystemInfo(), {}),
|
||||
L.resolveDefault(callCPUBench(), {}),
|
||||
L.resolveDefault(callCPUInfo(), {}),
|
||||
L.resolveDefault(callCPUUsage(), {}),
|
||||
L.resolveDefault(callTempInfo(), {}),
|
||||
fs.lines('/usr/lib/lua/luci/version.lua')
|
||||
]);
|
||||
@ -47,8 +53,9 @@ return baseclass.extend({
|
||||
systeminfo = data[1],
|
||||
cpubench = data[2],
|
||||
cpuinfo = data[3],
|
||||
tempinfo = data[4],
|
||||
luciversion = data[5];
|
||||
cpuusage = data[4],
|
||||
tempinfo = data[5],
|
||||
luciversion = data[6];
|
||||
|
||||
luciversion = luciversion.filter(function(l) {
|
||||
return l.match(/^\s*(luciname|luciversion)\s*=/);
|
||||
@ -84,7 +91,8 @@ return baseclass.extend({
|
||||
systeminfo.load[0] / 65535.0,
|
||||
systeminfo.load[1] / 65535.0,
|
||||
systeminfo.load[2] / 65535.0
|
||||
) : null
|
||||
) : null,
|
||||
_('CPU usage'), cpuusage.cpuusage
|
||||
];
|
||||
|
||||
if (tempinfo.tempinfo) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user