L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes for load average display ... see bug 3249

Browse Source
This commit is contained in:
moodler
2005-05-15 04:22:40 +00:00
parent 72b8cc16f1
commit 0e874e2c7a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/moodlelib.php
+3 -3
View File
@@ -6051,7 +6051,7 @@ function get_performance_info() {
list($server_load) = explode(' ', $loadavg[0]);
unset($loadavg);
} else if ( function_exists('is_executable') && is_executable('/usr/bin/uptime') && $loadavg = `/usr/bin/uptime` ) {
if (preg_match('/load averages?: (\d+:\d+)/', $loadavg, $matches)) {
if (preg_match('/load averages?: (\d+[\.:]\d+)/', $loadavg, $matches)) {
$server_load = $matches[1];
} else {
trigger_error('Could not parse uptime output!');
@@ -6059,8 +6059,8 @@ function get_performance_info() {
}
if (!empty($server_load)) {
$info['serverload'] = $server_load;
$info['html'] .= '<span class="serverload">Load average: '.$info['serverload'].'%</span> ';
$info['txt'] .= 'serverload: '.$info['serverload'].'% ';
$info['html'] .= '<span class="serverload">Load average: '.$info['serverload'].'</span> ';
$info['txt'] .= 'serverload: '.$info['serverload'];
}