gcontact update script, rebuilt follow page, query speedup for community and network...

[friendica.git] / include / poller.php

diff --git a/include/poller.php b/include/poller.php
index fd6f3922aa925f5d0dcbd6178528b5a1b610a04a..c681bfb3898448300578643ba2ad7ff14938bbb6 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -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;
        }
 
 }