Merge pull request #2228 from fabrixxm/issue_api

[friendica.git] / include / poller.php

diff --git a/include/poller.php b/include/poller.php
index 8c102a66b99bd6066010c5df7f2761362d6833ed..c681bfb3898448300578643ba2ad7ff14938bbb6 100644 (file)
--- 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;
                }
        }
@@ -56,8 +56,8 @@ function poller_run(&$argv, &$argc){
                                q("UPDATE `workerqueue` SET `executed` = '0000-00-00 00:00:00', `pid` = 0 WHERE `pid` = %d",
                                        intval($pid["pid"]));
                        else {
-                               // To-Do: Kill long running processes
-                               // But: Update processes (like the database update) mustn't be killed
+                               /// @TODO Kill long running processes
+                               /// But: Update processes (like the database update) mustn't be killed
                        }
 
        } else
@@ -72,6 +72,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")) {
 
+               // Count active workers and compare them with a maximum value that depends on the load
+               if (poller_too_much_workers(3))
+                       return;
+
                q("UPDATE `workerqueue` SET `executed` = '%s', `pid` = %d WHERE `id` = %d AND `executed` = '0000-00-00 00:00:00'",
                        dbesc(datetime_convert()),
                        intval(getmypid()),
@@ -116,10 +120,6 @@ function poller_run(&$argv, &$argc){
                // Quit the poller once every hour
                if (time() > ($starttime + 3600))
                        return;
-
-               // Count active workers and compare them with a maximum value that depends on the load
-               if (poller_too_much_workers(3))
-                       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;