Queue: Better handling of return values of transmissions

diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php
index e98d66a08b46952627fccac390a764df29aa2ecb..523bde4dbe71306407d0e07b3c285e82635c989f 100644 (file)
--- a/src/Worker/Delivery.php
+++ b/src/Worker/Delivery.php
@@ -313,7 +313,7 @@ class Delivery {
                                if (!Queue::wasDelayed($contact['id'])) {
                                        $deliver_status = DFRN::deliver($owner, $contact, $atom);
                                } else {
-                                       $deliver_status = (-1);
+                                       $deliver_status = -1;
                                }
 
                                logger('notifier: dfrn_delivery to '.$contact["url"].' with guid '.$target_item["guid"].' returns '.$deliver_status);
@@ -323,12 +323,12 @@ class Delivery {
                                        Queue::add($contact['id'], NETWORK_DFRN, $atom, false, $target_item['guid']);
                                }
 
-                               if ($deliver_status < 200) {
-                                       // The message could not be delivered. We mark the contact as "dead"
-                                       Contact::markForArchival($contact);
-                               } else {
+                               if (($deliver_status >= 200) && ($deliver_status <= 299)) {
                                        // We successfully delivered a message, the contact is alive
                                        Contact::unmarkForArchival($contact);
+                               } else {
+                                       // The message could not be delivered. We mark the contact as "dead"
+                                       Contact::markForArchival($contact);
                                }
 
                                break;

diff --git a/src/Worker/Queue.php b/src/Worker/Queue.php
index 3f4a764cee244f14f4aa927b7d4cd5cbfef68acf..aaf8df752d68f7145371f998f4174305c66a458c 100644 (file)
--- a/src/Worker/Queue.php
+++ b/src/Worker/Queue.php
@@ -63,6 +63,11 @@ class Queue
                        return;
                }
 
+               if (empty($contact['notify'])) {
+                       QueueModel::removeItem($q_item['id']);
+                       return;
+               }
+
                $dead = Cache::get($cachekey_deadguy . $contact['notify']);
 
                if (!is_null($dead) && $dead && !$no_dead_check) {
@@ -109,37 +114,33 @@ class Queue
                                logger('queue: dfrndelivery: item ' . $q_item['id'] . ' for ' . $contact['name'] . ' <' . $contact['url'] . '>');
                                $deliver_status = DFRN::deliver($owner, $contact, $data);
 
-                               if ($deliver_status == (-1)) {
+                               if (($deliver_status >= 200) && ($deliver_status <= 299)) {
+                                       QueueModel::removeItem($q_item['id']);
+                               } else {
                                        QueueModel::updateTime($q_item['id']);
                                        Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_QUARTER_HOUR);
-                               } else {
-                                       QueueModel::removeItem($q_item['id']);
                                }
                                break;
                        case NETWORK_OSTATUS:
-                               if ($contact['notify']) {
-                                       logger('queue: slapdelivery: item ' . $q_item['id'] . ' for ' . $contact['name'] . ' <' . $contact['url'] . '>');
-                                       $deliver_status = Salmon::slapper($owner, $contact['notify'], $data);
-
-                                       if ($deliver_status == (-1)) {
-                                               QueueModel::updateTime($q_item['id']);
-                                               Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_QUARTER_HOUR);
-                                       } else {
-                                               QueueModel::removeItem($q_item['id']);
-                                       }
+                               logger('queue: slapdelivery: item ' . $q_item['id'] . ' for ' . $contact['name'] . ' <' . $contact['url'] . '>');
+                               $deliver_status = Salmon::slapper($owner, $contact['notify'], $data);
+
+                               if ($deliver_status == -1) {
+                                       QueueModel::updateTime($q_item['id']);
+                                       Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_QUARTER_HOUR);
+                               } else {
+                                       QueueModel::removeItem($q_item['id']);
                                }
                                break;
                        case NETWORK_DIASPORA:
-                               if ($contact['notify']) {
-                                       logger('queue: diaspora_delivery: item ' . $q_item['id'] . ' for ' . $contact['name'] . ' <' . $contact['url'] . '>');
-                                       $deliver_status = Diaspora::transmit($owner, $contact, $data, $public, true, 'Queue:' . $q_item['id'], true);
-
-                                       if ($deliver_status == (-1)) {
-                                               QueueModel::updateTime($q_item['id']);
-                                               Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_QUARTER_HOUR);
-                                       } else {
-                                               QueueModel::removeItem($q_item['id']);
-                                       }
+                               logger('queue: diaspora_delivery: item ' . $q_item['id'] . ' for ' . $contact['name'] . ' <' . $contact['url'] . '>');
+                               $deliver_status = Diaspora::transmit($owner, $contact, $data, $public, true, 'Queue:' . $q_item['id'], true);
+
+                               if (($deliver_status >= 200) && ($deliver_status <= 299)) {
+                                       QueueModel::removeItem($q_item['id']);
+                               } else {
+                                       QueueModel::updateTime($q_item['id']);
+                                       Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_QUARTER_HOUR);
                                }
                                break;
 
@@ -154,7 +155,7 @@ class Queue
                                }
                                break;
                }
-               logger('Deliver status ' . (int) $deliver_status . ' for item ' . $q_item['id'] . ' to ' . $contact['name'] . ' <' . $contact['url'] . '>');
+               logger('Deliver status ' . (int)$deliver_status . ' for item ' . $q_item['id'] . ' to ' . $contact['name'] . ' <' . $contact['url'] . '>');
 
                return;
        }