Worker: Don't spawn without jobs

diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index ea8f6d24254cf24f63bb259e97236ee78004dcac..fe702cdf9d99c8977c9cb4772d2fe7871a654981 100644 (file)
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -702,7 +702,7 @@ class Worker
 
                        $processlist .= ' ('.implode(', ', $listitem).')';
 
-                       if (Config::get("system", "worker_fastlane", false) && ($queues > 0) && self::entriesExists() && ($active >= $queues)) {
+                       if (Config::get("system", "worker_fastlane", false) && ($queues > 0) && ($active >= $queues) && self::entriesExists()) {
                                $top_priority = self::highestPriority();
                                $high_running = self::processWithPriorityActive($top_priority);
 
@@ -715,7 +715,7 @@ class Worker
                        Logger::log("Load: " . $load ."/" . $maxsysload . " - processes: " . $deferred . "/" . $active . "/" . $waiting_processes . $processlist . " - maximum: " . $queues . "/" . $maxqueues, Logger::DEBUG);
 
                        // Are there fewer workers running as possible? Then fork a new one.
-                       if (!Config::get("system", "worker_dont_fork", false) && ($queues > ($active + 1)) && ($entries > 1)) {
+                       if (!Config::get("system", "worker_dont_fork", false) && ($queues > ($active + 1)) && self::entriesExists()) {
                                Logger::log("Active workers: ".$active."/".$queues." Fork a new worker.", Logger::DEBUG);
                                if (Config::get('system', 'worker_daemon_mode', false)) {
                                        self::IPCSetJobState(true);

diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index 57c25a68faa399053485a364af38db6c8acff554..4c78d3c6adc577641122e1eb9d1d174d07965872 100644 (file)
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -446,7 +446,8 @@ class Notifier
                                        // Ensure that posts with our own protocol arrives before Diaspora posts arrive.
                                        // Situation is that sometimes Friendica servers receive Friendica posts over the Diaspora protocol first.
                                        // The conversion in Markdown reduces the formatting, so these posts should arrive after the Friendica posts.
-                                       if ($rr['network'] == Protocol::DIASPORA) {
+                                       // This is only important for high and medium priority tasks and not for Low priority jobs like deletions.
+                                       if (($rr['network'] == Protocol::DIASPORA) && in_array($a->queue['priority'], [PRIORITY_HIGH, PRIORITY_MEDIUM])) {
                                                $deliver_options = ['priority' => $a->queue['priority'], 'dont_fork' => true];
                                        } else {
                                                $deliver_options = ['priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true];