oldkid/friendica
1
0
Fork 0
mirror of https://git.sekbaer.de/Friendica/friendica.git synced 2025-06-08 16:14:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fallback for load detection, additional checks

Browse source
This commit is contained in:
Michael 2022-09-22 05:45:42 +00:00
parent 30eb511da3
commit e1341b6ad3
2 changed files with 46 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/Core/System.php
View file

@ -442,17 +442,24 @@ class System
*/
public static function getLoadAvg(): array
{
$content = file_get_contents('/proc/loadavg');
$content = @file_get_contents('/proc/loadavg');
if (empty($content)) {
$content = shell_exec('cat /proc/loadavg');
}
if (empty($content)) {
return [];
if (empty($content) || !preg_match("#([.\d]+)\s([.\d]+)\s([.\d]+)\s(\d+)/(\d+)#", $content, $matches)) {
$load_arr = sys_getloadavg();
if (empty($load_arr)) {
return [];
}
return [
'average1' => $load_arr[0],
'average5' => $load_arr[1],
'average15' => $load_arr[2],
'runnable' => 0,
'scheduled' => 0
];
}
if (!preg_match("#([.\d]+)\s([.\d]+)\s([.\d]+)\s(\d+)/(\d+)#", $content, $matches)) {
return [];
}
return [
'average1' => (float)$matches[1],
'average5' => (float)$matches[2],