update to the FI translation THX Kris

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

diff --git a/src/Worker/Queue.php b/src/Worker/Queue.php
index d92be19fe3bf8ffac5c7b9db01bc9f17cf4bef74..57f6e92774dade5068cc82f46ca9c31fd670a29d 100644 (file)
--- a/src/Worker/Queue.php
+++ b/src/Worker/Queue.php
@@ -18,7 +18,6 @@ use dba;
 
 require_once 'include/dba.php';
 require_once 'include/items.php';
-require_once 'include/bbcode.php';
 
 class Queue
 {
@@ -32,30 +31,12 @@ class Queue
                $no_dead_check = Config::get('system', 'queue_no_dead_check', false);
 
                if (!$queue_id) {
-                       logger('queue: start');
+                       logger('filling queue jobs - start');
 
                        // Handling the pubsubhubbub requests
                        Worker::add(['priority' => PRIORITY_HIGH, 'dont_fork' => true], 'PubSubPublish');
 
-                       $r = q(
-                               "SELECT `queue`.*, `contact`.`name`, `contact`.`uid` FROM `queue`
-                               INNER JOIN `contact` ON `queue`.`cid` = `contact`.`id`
-                               WHERE `queue`.`created` < UTC_TIMESTAMP() - INTERVAL 3 DAY"
-                       );
-
-                       if (DBM::is_result($r)) {
-                               foreach ($r as $rr) {
-                                       logger('Removing expired queue item for ' . $rr['name'] . ', uid=' . $rr['uid']);
-                                       logger('Expired queue data: ' . $rr['content'], LOGGER_DATA);
-                               }
-                               q("DELETE FROM `queue` WHERE `created` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
-                       }
-
-                       /*
-                        * For the first 12 hours we'll try to deliver every 15 minutes
-                        * After that, we'll only attempt delivery once per hour.
-                        */
-                       $r = q("SELECT `id` FROM `queue` WHERE ((`created` > UTC_TIMESTAMP() - INTERVAL 12 HOUR AND `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE) OR (`last` < UTC_TIMESTAMP() - INTERVAL 1 HOUR)) ORDER BY `cid`, `created`");
+                       $r = dba::inArray(dba::p("SELECT `id` FROM `queue` WHERE `next` < UTC_TIMESTAMP() ORDER BY `batch`, `cid`"));
 
                        Addon::callHooks('queue_predeliver', $r);
 
@@ -65,6 +46,7 @@ class Queue
                                        Worker::add(['priority' => PRIORITY_LOW, 'dont_fork' => true], "Queue", (int) $q_item['id']);
                                }
                        }
+                       logger('filling queue jobs - end');
                        return;
                }
 
@@ -81,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) {
@@ -99,7 +86,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) {
@@ -127,37 +114,34 @@ 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)) {
-                                       QueueModel::updateTime($q_item['id']);
-                                       Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_QUARTER_HOUR);
-                               } else {
+                               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_MINUTE);
                                }
                                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_MINUTE);
+                               } 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)) ||
+                                       ($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_MINUTE);
                                }
                                break;
 
@@ -172,7 +156,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;
        }