Merge pull request #2110 from annando/1511-subscribe-feed

[friendica.git] / include / poller.php

diff --git a/include/poller.php b/include/poller.php
index 942fb6eafb248bd44169d2812e4a84259cfe52aa..45740dab62c3ba04975a08f41b112096968c4c53 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -68,14 +68,6 @@ function poller_run(&$argv, &$argc){
 
        while ($r = q("SELECT * FROM `workerqueue` WHERE `executed` = '0000-00-00 00:00:00' ORDER BY `created` LIMIT 1")) {
 
-               // 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())
-                       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()),
@@ -85,8 +77,10 @@ function poller_run(&$argv, &$argc){
                $id = q("SELECT `id` FROM `workerqueue` WHERE `id` = %d AND `pid` = %d",
                        intval($r[0]["id"]),
                        intval(getmypid()));
-               if (!$id)
+               if (!$id) {
+                       logger("Queue item ".$r[0]["id"]." was executed multiple times - skip this execution", LOGGER_DEBUG);
                        continue;
+               }
 
                $argv = json_decode($r[0]["parameter"]);
 
@@ -114,6 +108,14 @@ function poller_run(&$argv, &$argc){
                        q("DELETE FROM `workerqueue` WHERE `id` = %d", intval($r[0]["id"]));
                } else
                        logger("Function ".$funcname." does not exist");
+
+               // 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())
+                       return;
        }
 
 }