From d34432c517a97a5d1b61fd90e117c1a9cb3e172c Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 5 May 2022 06:12:16 +0000 Subject: [PATCH] Ignore if the worker was added --- src/Worker/Notifier.php | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php index 0ce5ed92a7..48b81b9a99 100644 --- a/src/Worker/Notifier.php +++ b/src/Worker/Notifier.php @@ -787,11 +787,9 @@ class Notifier Logger::info('Delivery via ActivityPub', ['cmd' => $cmd, 'id' => $target_item['id'], 'inbox' => $inbox]); if (DI::config()->get('system', 'bulk_delivery')) { - if (Worker::add(['priority' => $priority, 'created' => $created, 'dont_fork' => true], - 'APDelivery', $cmd, 0, $inbox, $uid)) { - $delivery_queue_count++; - Post\Delivery::add($target_item['uri-id'], $uid, $inbox, $target_item['created'], $cmd); - } + $delivery_queue_count++; + Post\Delivery::add($target_item['uri-id'], $uid, $inbox, $target_item['created'], $cmd); + Worker::add(['priority' => $priority, 'dont_fork' => true], 'APDelivery', $cmd, 0, $inbox, $uid); } else { if (Worker::add(['priority' => $priority, 'created' => $created, 'dont_fork' => true], 'APDelivery', $cmd, $target_item['id'], $inbox, $uid, $receivers, $target_item['uri-id'])) { @@ -805,10 +803,9 @@ class Notifier Logger::info('Delivery to relay servers via ActivityPub', ['cmd' => $cmd, 'id' => $target_item['id'], 'inbox' => $inbox]); if (DI::config()->get('system', 'bulk_delivery')) { - if (Worker::add(['priority' => $priority, 'dont_fork' => true], 'APDelivery', $cmd, 0, $inbox, $uid)) { - $delivery_queue_count++; - Post\Delivery::add($target_item['uri-id'], $uid, $inbox, $target_item['created'], $cmd); - } + $delivery_queue_count++; + Post\Delivery::add($target_item['uri-id'], $uid, $inbox, $target_item['created'], $cmd); + Worker::add(['priority' => $priority, 'dont_fork' => true], 'APDelivery', $cmd, 0, $inbox, $uid); } else { if (Worker::add(['priority' => $priority, 'dont_fork' => true], 'APDelivery', $cmd, $target_item['id'], $inbox, $uid, [], $target_item['uri-id'])) { $delivery_queue_count++; -- 2.39.5