From 46d3e64e71a6288bff118bba1bef7b50db585bb1 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sat, 26 Mar 2022 19:17:46 +0800 Subject: [PATCH] autocore: 10_system: fix parse data Signed-off-by: Tianling Shen (cherry picked from commit 51225d75e433deb36a5a9c32a71e4b4a81259a6b) --- package/emortal/autocore/files/generic/10_system.js | 6 +++--- package/emortal/autocore/files/generic/luci | 12 ++++++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/package/emortal/autocore/files/generic/10_system.js b/package/emortal/autocore/files/generic/10_system.js index c4978ea7fc..729a648885 100644 --- a/package/emortal/autocore/files/generic/10_system.js +++ b/package/emortal/autocore/files/generic/10_system.js @@ -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' }); diff --git a/package/emortal/autocore/files/generic/luci b/package/emortal/autocore/files/generic/luci index 3340515b0d..7a8aaea72c 100755 --- a/package/emortal/autocore/files/generic/luci +++ b/package/emortal/autocore/files/generic/luci @@ -618,8 +618,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 }, @@ -627,9 +628,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 @@ -640,8 +643,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 },