fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

autocore: fix typo error

Browse Source
This commit is contained in:
CN_SZTL 2020-03-22 06:34:41 +08:00
parent c96bfccde6
commit a9c0a21fa3
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
3 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/lean/autocore/files/rpcd_10_system.js
View File

@ -74,7 +74,6 @@ return L.Class.extend({
_('Hostname'), boardinfo.hostname,
_('Model'), boardinfo.model + cpubench.cpubench,
_('CPU Info'), cpuinfo.cpuinfo,
_('Architecture'), boardinfo.system,
_('Firmware Version'), (L.isObject(boardinfo.release) ? boardinfo.release.description + ' / ' : '') + (luciversion || ''),
_('Kernel Version'), boardinfo.kernel,
_('Local Time'), datestr,

55
package/lean/autocore/files/rpcd_luci
View File

@ -613,22 +613,6 @@ local methods = {
end
},
getCPUUsage = {
call = function()
local sys = require "luci.sys"
local cpuusage = {}
sys.call("/bin/getcpu &")
cpuusage.cpuusage = sys.exec("cat /tmp/cpuusage 2>/dev/null")
if (cpuusage.cpuusage == nil) or (cpuusage.cpuusage == "") then
cpuusage.cpuusage = "2.33%"
end
return cpuusage
end
},
getCPUBench = {
call = function()
local sys = require "luci.sys"
@ -639,17 +623,6 @@ local methods = {
end
},
getOnlineUsers = {
call = function()
local sys = require "luci.sys"
local onlineusers = {}
onlineusers.onlineusers = sys.exec("cat /proc/net/arp | grep 'br-lan' | grep '0x2' | wc -l")
return onlineusers
end
},
getCPUInfo = {
call = function()
local sys = require "luci.sys"
@ -665,6 +638,22 @@ local methods = {
end
},
getCPUUsage = {
call = function()
local sys = require "luci.sys"
local cpuusage = {}
sys.call("/bin/getcpu &")
cpuusage.cpuusage = sys.exec("cat /tmp/cpuusage 2>/dev/null")
if (cpuusage.cpuusage == nil) or (cpuusage.cpuusage == "") then
cpuusage.cpuusage = "2.33%"
end
return cpuusage
end
},
getETHInfo = {
call = function()
local sys = require "luci.sys"
@ -686,6 +675,18 @@ local methods = {
fd:close()
return { ethinfo = rv }
end
},
getOnlineUsers = {
call = function()
local sys = require "luci.sys"
local onlineusers = {}
onlineusers.onlineusers = sys.exec("cat /proc/net/arp | grep 'br-lan' | grep '0x2' | wc -l")
return onlineusers
end
}
}
local function parseInput()

2
package/lean/autocore/files/rpcd_luci-base.json
View File

@ -61,7 +61,7 @@
"ubus": {
"file": [ "list", "read", "stat" ],
"iwinfo": [ "assoclist", "freqlist", "txpowerlist", "countrylist" ],
"luci": [ "getConntrackList", "getInitList", "getLocaltime", "getProcessList", "getRealtimeStats", "getTimezones", "getLEDs", "getUSBDevices", "getSwconfigFeatures", "getSwconfigPortState", "getBlockDevices", "getMountPoints", "getCPUBench", "getCPUUsage", "getOnlineUsers", "getETHInfo" ],
"luci": [ "getConntrackList", "getInitList", "getLocaltime", "getProcessList", "getRealtimeStats", "getTimezones", "getLEDs", "getUSBDevices", "getSwconfigFeatures", "getSwconfigPortState", "getBlockDevices", "getMountPoints", "getCPUBench", "getCPUInfo", "getCPUUsage", "getETHInfo", "getOnlineUsers" ],
"luci-rpc": [ "getBoardJSON", "getDHCPLeases", "getDSLStatus", "getDUIDHints", "getHostHints", "getNetworkDevices", "getWirelessDevices" ],
"network.interface": [ "dump" ],
"network.rrdns": [ "lookup" ],