Fix small typo / Workerqueue count now only counts non deferred entries

diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index c053e32bc8859a25e1b32b0aabf6ab73d0f9bdbb..f3736d2573f7e10fbe4f934b42d434577380e7e3 100644 (file)
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -668,9 +668,10 @@ class Worker
                                DBA::close($processes);
 
                                // Now adding all processes with workerqueue entries
-                               $entries = DBA::p("SELECT COUNT(*) AS `entries`, `priority` FROM `workerqueue` WHERE NOT `done` GROUP BY `priority`");
+                               $entries = DBA::p("SELECT COUNT(*) AS `entries`, `priority` FROM `workerqueue` WHERE NOT `done` AND `next_try` < ? GROUP BY `priority`", DateTimeFormat::utcNow());
                                while ($entry = DBA::fetch($entries)) {
-                                       $processes = DBA::p("SELECT COUNT(*) AS `running` FROM `process` INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid` AND NOT `done` WHERE `priority` = ?", $entry["priority"]);
+                                       $processes = DBA::p("SELECT COUNT(*) AS `running` FROM `process` INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid` WHERE NOT `done` AND `next_try` < ? AND `priority` = ?",
+                                               DateTimeFormat::utcNow(), $entry["priority"]);
                                        if ($process = DBA::fetch($processes)) {
                                                $listitem[$entry["priority"]] = $entry["priority"].":".$process["running"]."/".$entry["entries"];
                                        }

diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php
index 379fb7a7fcf3a529ddc41b73bff5189acd4a5e58..2cc165b233d7e230a44f7479b59a5f11633e8fc2 100644 (file)
--- a/src/Protocol/ActivityPub/Receiver.php
+++ b/src/Protocol/ActivityPub/Receiver.php
@@ -240,7 +240,7 @@ class Receiver
        }
 
        /**
-        * Fetches the first uider id from the receiver array
+        * Fetches the first user id from the receiver array
         *
         * @param array $receivers Array with receivers
         * @return integer user id;