diff --git a/emhttp/plugins/dynamix/DashStats.page b/emhttp/plugins/dynamix/DashStats.page index 982d47515..32ea824dc 100644 --- a/emhttp/plugins/dynamix/DashStats.page +++ b/emhttp/plugins/dynamix/DashStats.page @@ -1481,14 +1481,29 @@ function LockButton() { $('table.dashboard').sortable('destroy'); } } + +function cpu_parse(msg) { + var parse = {}, section = ''; + msg.split('\n').forEach(function(row) { + if (row.substr(0,1) == '[') { + section = row.substr(1,row.length-2); + parse[section] = {}; + } else { + var data = row.split('='); + parse[section][data[0]] = data[1]; + } + }); + return parse; +} + var dashboard = new NchanSubscriber('/sub/cpuload,update1,update2,update3',{subscriber:'websocket'}); dashboard.on('message',function(msg,meta) { switch (meta.id.channel()) { case 0: - var get = parseINI(msg); + var get = cpu_parse(msg); // cpu load $.each(get,function(k,v) { - var load = v['host']; + var load = v.host; var color = setColor(load, 90, 70); if (k=='cpu') { addChartCpu(load);