zhao/autocore-arm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Update 10_system.js"

Browse Source 
This reverts commit dbcc6ca09d45d82cb68392a6a76df1e4997be888.
This commit is contained in:
sbwml 2022-07-30 06:26:27 +08:00
parent dbcc6ca09d
commit 95c3126773
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
files/generic/10_system.js
View File

@ -23,6 +23,11 @@ var callCPUInfo = rpc.declare({
method: 'getCPUInfo' method: 'getCPUInfo'
}); });
var callCPUUsage = rpc.declare({
object: 'luci',
method: 'getCPUUsage'
});
var callTempInfo = rpc.declare({ var callTempInfo = rpc.declare({
object: 'luci', object: 'luci',
method: 'getTempInfo' method: 'getTempInfo'
@ -37,6 +42,7 @@ return baseclass.extend({
L.resolveDefault(callSystemInfo(), {}), L.resolveDefault(callSystemInfo(), {}),
L.resolveDefault(callCPUBench(), {}), L.resolveDefault(callCPUBench(), {}),
L.resolveDefault(callCPUInfo(), {}), L.resolveDefault(callCPUInfo(), {}),
L.resolveDefault(callCPUUsage(), {}),
L.resolveDefault(callTempInfo(), {}), L.resolveDefault(callTempInfo(), {}),
fs.lines('/usr/lib/lua/luci/version.lua') fs.lines('/usr/lib/lua/luci/version.lua')
]); ]);
@ -47,8 +53,9 @@ return baseclass.extend({
systeminfo = data[1], systeminfo = data[1],
cpubench = data[2], cpubench = data[2],
cpuinfo = data[3], cpuinfo = data[3],
tempinfo = data[4], cpuusage = data[4],
luciversion = data[5]; tempinfo = data[5],
luciversion = data[6];
luciversion = luciversion.filter(function(l) { luciversion = luciversion.filter(function(l) {
return l.match(/^\s*(luciname|luciversion)\s*=/); return l.match(/^\s*(luciname|luciversion)\s*=/);
@ -84,7 +91,8 @@ return baseclass.extend({
systeminfo.load[0] / 65535.0, systeminfo.load[0] / 65535.0,
systeminfo.load[1] / 65535.0, systeminfo.load[1] / 65535.0,
systeminfo.load[2] / 65535.0 systeminfo.load[2] / 65535.0
) : null ) : null,
_('CPU usage'), cpuusage.cpuusage
]; ];
if (tempinfo.tempinfo) { if (tempinfo.tempinfo) {