diff --git a/boot.php b/boot.php index 05a334a1fa..cc56949009 100644 --- a/boot.php +++ b/boot.php @@ -1948,3 +1948,15 @@ function validate_include(&$file) { return true; } + +function current_load() { + if (!function_exists('sys_getloadavg')) + return false; + + $load_arr = sys_getloadavg(); + + if (!is_array($load_arr)) + return false; + + return max($load_arr); +} diff --git a/include/cron.php b/include/cron.php index 8bf168ed50..18674817d3 100644 --- a/include/cron.php +++ b/include/cron.php @@ -44,10 +44,11 @@ function cron_run(&$argv, &$argc){ $maxsysload = intval(get_config('system','maxloadavg')); if($maxsysload < 1) $maxsysload = 50; - if(function_exists('sys_getloadavg')) { - $load = sys_getloadavg(); - if(intval($load[0]) > $maxsysload) { - logger('system: load ' . $load[0] . ' too high. cron deferred to next scheduled run.'); + + $load = current_load(); + if($load) { + if(intval($load) > $maxsysload) { + logger('system: load ' . $load . ' too high. cron deferred to next scheduled run.'); return; } } diff --git a/include/cronhooks.php b/include/cronhooks.php index d5b4f3bf6f..8c70008e45 100644 --- a/include/cronhooks.php +++ b/include/cronhooks.php @@ -27,10 +27,11 @@ function cronhooks_run(&$argv, &$argc){ $maxsysload = intval(get_config('system','maxloadavg')); if($maxsysload < 1) $maxsysload = 50; - if(function_exists('sys_getloadavg')) { - $load = sys_getloadavg(); - if(intval($load[0]) > $maxsysload) { - logger('system: load ' . $load[0] . ' too high. Cronhooks deferred to next scheduled run.'); + + $load = current_load(); + if($load) { + if(intval($load) > $maxsysload) { + logger('system: load ' . $load . ' too high. Cronhooks deferred to next scheduled run.'); return; } } diff --git a/include/delivery.php b/include/delivery.php index dc02faaba8..4d87b8bb74 100644 --- a/include/delivery.php +++ b/include/delivery.php @@ -58,10 +58,11 @@ function delivery_run(&$argv, &$argc){ $maxsysload = intval(get_config('system','maxloadavg')); if($maxsysload < 1) $maxsysload = 50; - if(function_exists('sys_getloadavg')) { - $load = sys_getloadavg(); - if(intval($load[0]) > $maxsysload) { - logger('system: load ' . $load[0] . ' too high. Delivery deferred to next queue run.'); + + $load = current_load(); + if($load) { + if(intval($load) > $maxsysload) { + logger('system: load ' . $load . ' too high. Delivery deferred to next queue run.'); return; } } diff --git a/include/discover_poco.php b/include/discover_poco.php index a8e7ec64d0..6293317d3f 100644 --- a/include/discover_poco.php +++ b/include/discover_poco.php @@ -28,10 +28,11 @@ function discover_poco_run(&$argv, &$argc){ $maxsysload = intval(get_config('system','maxloadavg')); if($maxsysload < 1) $maxsysload = 50; - if(function_exists('sys_getloadavg')) { - $load = sys_getloadavg(); - if(intval($load[0]) > $maxsysload) { - logger('system: load ' . $load[0] . ' too high. discover_poco deferred to next scheduled run.'); + + $load = current_load(); + if($load) { + if(intval($load) > $maxsysload) { + logger('system: load ' . $load . ' too high. discover_poco deferred to next scheduled run.'); return; } } diff --git a/include/poller.php b/include/poller.php index 8c102a66b9..fd6f3922aa 100644 --- a/include/poller.php +++ b/include/poller.php @@ -26,14 +26,14 @@ function poller_run(&$argv, &$argc){ unset($db_host, $db_user, $db_pass, $db_data); }; - if(function_exists('sys_getloadavg')) { + $load = current_load(); + if($load) { $maxsysload = intval(get_config('system','maxloadavg')); if($maxsysload < 1) $maxsysload = 50; - $load = sys_getloadavg(); - if(intval($load[0]) > $maxsysload) { - logger('system: load ' . $load[0] . ' too high. poller deferred to next scheduled run.'); + if(intval($load) > $maxsysload) { + logger('system: load ' . $load . ' too high. poller deferred to next scheduled run.'); return; } } @@ -134,9 +134,8 @@ function poller_too_much_workers($stage) { $active = poller_active_workers(); // Decrease the number of workers at higher load - if(function_exists('sys_getloadavg')) { - $load = max(sys_getloadavg()); - + $load = current_load(); + if($load) { $maxsysload = intval(get_config('system','maxloadavg')); if($maxsysload < 1) $maxsysload = 50; diff --git a/index.php b/index.php index 9fe248e8e2..89ed058465 100644 --- a/index.php +++ b/index.php @@ -56,10 +56,11 @@ if(!$install) { $maxsysload_frontend = intval(get_config('system','maxloadavg_frontend')); if($maxsysload_frontend < 1) $maxsysload_frontend = 50; - if(function_exists('sys_getloadavg')) { - $load = sys_getloadavg(); - if(intval($load[0]) > $maxsysload_frontend) { - logger('system: load ' . $load[0] . ' too high. Service Temporarily Unavailable.'); + + $load = current_load(); + if($load) { + if($load > $maxsysload_frontend) { + logger('system: load ' . $load . ' too high. Service Temporarily Unavailable.'); header($_SERVER["SERVER_PROTOCOL"].' 503 Service Temporarily Unavailable'); header('Retry-After: 300'); die("System is currently unavailable. Please try again later");