mirror of
https://github.com/friendica/friendica
synced 2024-12-23 09:20:17 +00:00
Merge pull request #12015 from annando/proc-access
Check the readability before acessing /proc/loadavg
This commit is contained in:
commit
27376a3dae
1 changed files with 6 additions and 3 deletions
|
@ -442,10 +442,13 @@ class System
|
||||||
*/
|
*/
|
||||||
public static function getLoadAvg(): array
|
public static function getLoadAvg(): array
|
||||||
{
|
{
|
||||||
|
if (is_readable('/proc/loadavg')) {
|
||||||
$content = @file_get_contents('/proc/loadavg');
|
$content = @file_get_contents('/proc/loadavg');
|
||||||
if (empty($content)) {
|
if (empty($content)) {
|
||||||
$content = shell_exec('cat /proc/loadavg');
|
$content = shell_exec('cat /proc/loadavg');
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (empty($content) || !preg_match("#([.\d]+)\s([.\d]+)\s([.\d]+)\s(\d+)/(\d+)#", $content, $matches)) {
|
if (empty($content) || !preg_match("#([.\d]+)\s([.\d]+)\s([.\d]+)\s(\d+)/(\d+)#", $content, $matches)) {
|
||||||
$load_arr = sys_getloadavg();
|
$load_arr = sys_getloadavg();
|
||||||
if (empty($load_arr)) {
|
if (empty($load_arr)) {
|
||||||
|
|
Loading…
Reference in a new issue