Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
Open sidebar
Guilherme Filippo
ISPConfig 3
Commits
e2532029
Commit
e2532029
authored
Jan 18, 2010
by
oilyflutesalad
Browse files
Fixed: FS#928 - System Load Averages should no longer show as zero on non-english linux distros
parent
40e65701
Changes
1
Hide whitespace changes
Inline
Side-by-side
server/mods-available/monitor_core_module.inc.php
View file @
e2532029
...
...
@@ -148,12 +148,20 @@ class monitor_core_module {
$tmp
=
explode
(
","
,
$data
[
'uptime'
],
4
);
$tmpUser
=
explode
(
" "
,
trim
(
$tmp
[
2
]));
$data
[
'user_online'
]
=
intval
(
$tmpUser
[
0
]);
/* Old Load Average Code
$loadTmp = explode(":" , trim($tmp[3]));
$load = explode(",", $loadTmp[1]);
$data['load_1'] = floatval(trim($load[0]));
$data['load_5'] = floatval(trim($load[1]));
$data
[
'load_15'
]
=
floatval
(
trim
(
$load
[
2
]));
$data['load_15'] = floatval(trim($load[2])); */
//* New Load Average code to fix "always zero" bug in non-english distros. NEEDS TESTING
$loadTmp
=
shell_exec
(
"cat /proc/loadavg | cut -f1-3 -d' '"
);
$load
=
explode
(
" "
,
$loadTmp
);
$data
[
'load_1'
]
=
floatval
(
str_replace
(
','
,
'.'
,
$load
[
0
]));
$data
[
'load_5'
]
=
floatval
(
str_replace
(
','
,
'.'
,
$load
[
1
]));
$data
[
'load_15'
]
=
floatval
(
str_replace
(
','
,
'.'
,
$load
[
2
]));
/** The state of the server-load. */
$state
=
'ok'
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment