Merge pull request #5234 from fabrixxm/fix/api

[friendica.git] / src / Worker / Queue.php

diff --git a/src/Worker/Queue.php b/src/Worker/Queue.php
index aaf8df752d68f7145371f998f4174305c66a458c..89ec2826270dd04c57fff62af912f8acf4646ff2 100644 (file)
--- a/src/Worker/Queue.php
+++ b/src/Worker/Queue.php
@@ -10,6 +10,7 @@ use Friendica\Core\Config;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Model\Queue as QueueModel;
+use Friendica\Model\PushSubscriber;
 use Friendica\Protocol\DFRN;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\PortableContact;
@@ -34,9 +35,9 @@ class Queue
                        logger('filling queue jobs - start');
 
                        // Handling the pubsubhubbub requests
-                       Worker::add(['priority' => PRIORITY_HIGH, 'dont_fork' => true], 'PubSubPublish');
+                       PushSubscriber::requeue();
 
-                       $r = dba::inArray(dba::p("SELECT `id` FROM `queue` WHERE `next` < UTC_TIMESTAMP()"));
+                       $r = dba::inArray(dba::p("SELECT `id` FROM `queue` WHERE `next` < UTC_TIMESTAMP() ORDER BY `batch`, `cid`"));
 
                        Addon::callHooks('queue_predeliver', $r);
 
@@ -63,7 +64,7 @@ class Queue
                        return;
                }
 
-               if (empty($contact['notify'])) {
+               if (empty($contact['notify']) || $contact['archive']) {
                        QueueModel::removeItem($q_item['id']);
                        return;
                }
@@ -86,7 +87,7 @@ class Queue
                                        logger("Check server " . $server . " (" . $contact["network"] . ")");
 
                                        $vital = PortableContact::checkServer($server, $contact["network"], true);
-                                       Cache::set($cachekey_server . $server, $vital, CACHE_QUARTER_HOUR);
+                                       Cache::set($cachekey_server . $server, $vital, CACHE_MINUTE);
                                }
 
                                if (!is_null($vital) && !$vital) {
@@ -118,7 +119,7 @@ class Queue
                                        QueueModel::removeItem($q_item['id']);
                                } else {
                                        QueueModel::updateTime($q_item['id']);
-                                       Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_QUARTER_HOUR);
+                                       Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_MINUTE);
                                }
                                break;
                        case NETWORK_OSTATUS:
@@ -127,7 +128,7 @@ class Queue
 
                                if ($deliver_status == -1) {
                                        QueueModel::updateTime($q_item['id']);
-                                       Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_QUARTER_HOUR);
+                                       Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_MINUTE);
                                } else {
                                        QueueModel::removeItem($q_item['id']);
                                }
@@ -136,11 +137,12 @@ class Queue
                                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)) {
+                               if ((($deliver_status >= 200) && ($deliver_status <= 299)) ||
+                                       ($contact['contact-type'] == ACCOUNT_TYPE_RELAY)) {
                                        QueueModel::removeItem($q_item['id']);
                                } else {
                                        QueueModel::updateTime($q_item['id']);
-                                       Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_QUARTER_HOUR);
+                                       Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_MINUTE);
                                }
                                break;