Skip to content

Commit e253202

Browse files
author
oilyflutesalad
committed
Fixed: FS#928 - System Load Averages should no longer show as zero on non-english linux distros
1 parent 40e6570 commit e253202

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

server/mods-available/monitor_core_module.inc.php

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,12 +148,20 @@ function monitorServer(){
148148
$tmp = explode(",", $data['uptime'], 4);
149149
$tmpUser = explode(" ", trim($tmp[2]));
150150
$data['user_online'] = intval($tmpUser[0]);
151-
151+
152+
/* Old Load Average Code
152153
$loadTmp = explode(":" , trim($tmp[3]));
153154
$load = explode(",", $loadTmp[1]);
154155
$data['load_1'] = floatval(trim($load[0]));
155156
$data['load_5'] = floatval(trim($load[1]));
156-
$data['load_15'] = floatval(trim($load[2]));
157+
$data['load_15'] = floatval(trim($load[2])); */
158+
159+
//* New Load Average code to fix "always zero" bug in non-english distros. NEEDS TESTING
160+
$loadTmp = shell_exec("cat /proc/loadavg | cut -f1-3 -d' '");
161+
$load = explode(" ", $loadTmp);
162+
$data['load_1'] = floatval(str_replace(',', '.', $load[0]));
163+
$data['load_5'] = floatval(str_replace(',', '.', $load[1]));
164+
$data['load_15'] = floatval(str_replace(',', '.', $load[2]));
157165

158166
/** The state of the server-load. */
159167
$state = 'ok';

0 commit comments

Comments
 (0)