From bbbebb2b9c8ff401829d336e2c39c0dc0cecfc10 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 30 Apr 2018 05:56:40 +0000 Subject: [PATCH] Don't spool relay deliveries --- src/Worker/Delivery.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php index f874e5f23..423691e2a 100644 --- a/src/Worker/Delivery.php +++ b/src/Worker/Delivery.php @@ -275,6 +275,13 @@ class Delivery extends BaseObject $public_dfrn = ($contact['contact-type'] == ACCOUNT_TYPE_RELAY); $deliver_status = DFRN::transmit($owner, $contact, $atom, $public_dfrn); + + // We never spool failed relay deliveries + if ($public_dfrn) { + logger('Relay delivery to ' . $contact["url"] . ' with guid ' . $target_item["guid"] . ' returns ' . $deliver_status); + return; + } + if (($deliver_status < 200) || ($deliver_status > 299)) { // Transmit via Diaspora if not possible via Friendica self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup);