Automatically refresh after two minutes when system is overloaded

[friendica.git] / include / poller.php

diff --git a/include/poller.php b/include/poller.php
index 755862eb6bf32d51247967890910d951aed4d26a..d134f30d0fac270001d5cac8d9e98bc1411d81d7 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -26,20 +26,14 @@ function poller_run(&$argv, &$argc){
                unset($db_host, $db_user, $db_pass, $db_data);
        };
 
-       if (poller_max_connections_reached())
+       if ($a->max_processes_reached())
                return;
 
-       $load = current_load();
-       if($load) {
-               $maxsysload = intval(get_config('system','maxloadavg'));
-               if($maxsysload < 1)
-                       $maxsysload = 50;
+       if (poller_max_connections_reached())
+               return;
 
-               if(intval($load) > $maxsysload) {
-                       logger('system: load ' . $load . ' too high. poller deferred to next scheduled run.');
-                       return;
-               }
-       }
+       if (App::maxload_reached())
+               return;
 
        // Checking the number of workers
        if (poller_too_much_workers(1)) {
@@ -68,6 +62,10 @@ function poller_run(&$argv, &$argc){
 
        while ($r = q("SELECT * FROM `workerqueue` WHERE `executed` = '0000-00-00 00:00:00' ORDER BY `created` LIMIT 1")) {
 
+               // Constantly check the number of parallel database processes
+               if ($a->max_processes_reached())
+                       return;
+
                // Constantly check the number of available database connections to let the frontend be accessible at any time
                if (poller_max_connections_reached())
                        return;
@@ -134,6 +132,11 @@ function poller_max_connections_reached() {
        // Fetch the max value from the config. This is needed when the system cannot detect the correct value by itself.
        $max = get_config("system", "max_connections");
 
+       // Fetch the percentage level where the poller will get active
+       $maxlevel = get_config("system", "max_connections_level");
+       if ($maxlevel == 0)
+               $maxlevel = 75;
+
        if ($max == 0) {
                // the maximum number of possible user connections can be a system variable
                $r = q("SHOW VARIABLES WHERE `variable_name` = 'max_user_connections'");
@@ -162,10 +165,10 @@ function poller_max_connections_reached() {
 
                logger("Connection usage (user values): ".$used."/".$max, LOGGER_DEBUG);
 
-               $level = $used / $max;
+               $level = ($used / $max) * 100;
 
-               if ($level >= (3/4)) {
-                       logger("Maximum level (3/4) of user connections reached: ".$used."/".$max);
+               if ($level >= $maxlevel) {
+                       logger("Maximum level (".$maxlevel."%) of user connections reached: ".$used."/".$max);
                        return true;
                }
        }
@@ -190,12 +193,12 @@ function poller_max_connections_reached() {
 
        logger("Connection usage (system values): ".$used."/".$max, LOGGER_DEBUG);
 
-       $level = $used / $max;
+       $level = $used / $max * 100;
 
-       if ($level < (3/4))
+       if ($level < $maxlevel)
                return false;
 
-       logger("Maximum level (3/4) of system connections reached: ".$used."/".$max);
+       logger("Maximum level (".$level."%) of system connections reached: ".$used."/".$max);
        return true;
 }
 
@@ -206,7 +209,7 @@ function poller_max_connections_reached() {
 function poller_kill_stale_workers() {
        $r = q("SELECT `pid`, `executed` FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'");
 
-       if (!is_array($r) || count($r) == 0) {
+       if (!dbm::is_result($r)) {
                // No processing here needed
                return;
        }