addon stuff

[friendica.git] / include / poller.php

diff --git a/include/poller.php b/include/poller.php
index bbec43ae7bcc2c1e1f6895ab4a959e6b090cd50e..2e036247e237cf06c40d5f514300b2c57e1a1525 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -98,6 +98,7 @@ function poller_run(&$argv, &$argc){
 
                if (!$upd) {
                        logger("Couldn't update queue entry ".$r[0]["id"]." - skip this execution", LOGGER_DEBUG);
+                       q("COMMIT");
                        continue;
                }
 
@@ -105,14 +106,18 @@ function poller_run(&$argv, &$argc){
                $id = q("SELECT `pid`, `executed` FROM `workerqueue` WHERE `id` = %d", intval($r[0]["id"]));
                if (!$id) {
                        logger("Queue item ".$r[0]["id"]." vanished - skip this execution", LOGGER_DEBUG);
+                       q("COMMIT");
                        continue;
                } elseif ((strtotime($id[0]["executed"]) <= 0) OR ($id[0]["pid"] == 0)) {
-                       logger("Entry for queue item ".$r[0]["id"]." wasn't stored - we better stop here", LOGGER_DEBUG);
-                       return;
+                       logger("Entry for queue item ".$r[0]["id"]." wasn't stored - skip this execution", LOGGER_DEBUG);
+                       q("COMMIT");
+                       continue;
                } elseif ($id[0]["pid"] != $mypid) {
                        logger("Queue item ".$r[0]["id"]." is to be executed by process ".$id[0]["pid"]." and not by me (".$mypid.") - skip this execution", LOGGER_DEBUG);
+                       q("COMMIT");
                        continue;
                }
+               q("COMMIT");
 
                $argv = json_decode($r[0]["parameter"]);
 
@@ -433,6 +438,8 @@ function poller_passing_slow(&$highest_priority) {
 
 function poller_worker_process() {
 
+       q("START TRANSACTION;");
+
        // Check if we should pass some low priority process
        $highest_priority = 0;