Frio Bugfix: clear float at the end of comment-edit

[friendica.git] / include / poller.php

diff --git a/include/poller.php b/include/poller.php
index 20cdf2d3626a6299196938eb60459ea5ab755f8e..2e036247e237cf06c40d5f514300b2c57e1a1525 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -91,23 +91,33 @@ function poller_run(&$argv, &$argc){
                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'",
+               $upd = q("UPDATE `workerqueue` SET `executed` = '%s', `pid` = %d WHERE `id` = %d AND `pid` = 0",
                        dbesc(datetime_convert()),
                        intval($mypid),
                        intval($r[0]["id"]));
 
+               if (!$upd) {
+                       logger("Couldn't update queue entry ".$r[0]["id"]." - skip this execution", LOGGER_DEBUG);
+                       q("COMMIT");
+                       continue;
+               }
+
                // Assure that there are no tasks executed twice
                $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"]);
 
@@ -328,7 +338,28 @@ function poller_too_much_workers() {
                        }
                }
 
-               logger("Current load: ".$load." - maximum: ".$maxsysload." - current queues: ".$active."/".$entries." - maximum: ".$queues."/".$maxqueues, LOGGER_DEBUG);
+               // Create a list of queue entries grouped by their priority
+               $running = array(PRIORITY_CRITICAL => 0,
+                               PRIORITY_HIGH => 0,
+                               PRIORITY_MEDIUM => 0,
+                               PRIORITY_LOW => 0,
+                               PRIORITY_NEGLIGIBLE => 0);
+
+               $r = q("SELECT COUNT(*) AS `running`, `priority` FROM `process` INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid` GROUP BY `priority`");
+               if (dbm::is_result($r))
+                       foreach ($r AS $process)
+                               $running[$process["priority"]] = $process["running"];
+
+               $processlist = "";
+               $r = q("SELECT COUNT(*) AS `entries`, `priority` FROM `workerqueue` GROUP BY `priority`");
+               if (dbm::is_result($r))
+                       foreach ($r as $entry) {
+                               if ($processlist != "")
+                                       $processlist .= ", ";
+                               $processlist .= $entry["priority"].":".$running[$entry["priority"]]."/".$entry["entries"];
+                       }
+
+               logger("Load: ".$load."/".$maxsysload." - processes: ".$active."/".$entries." (".$processlist.") - maximum: ".$queues."/".$maxqueues, LOGGER_DEBUG);
 
                // Are there fewer workers running as possible? Then fork a new one.
                if (!get_config("system", "worker_dont_fork") AND ($queues > ($active + 1)) AND ($entries > 1)) {
@@ -407,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;