removed memcache unit-test because lack of support in travis

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

diff --git a/src/Model/Queue.php b/src/Model/Queue.php
index 6c49ff4d1a31bf6a02d396b7263558fbdcfe07dd..8b9e801c3ffc616af346e94322b4be112bbcc74c 100644 (file)
--- a/src/Model/Queue.php
+++ b/src/Model/Queue.php
@@ -6,11 +6,10 @@ namespace Friendica\Model;
 
 use Friendica\Core\Config;
 use Friendica\Database\DBM;
-use Friendica\Util\Temporal;
+use Friendica\Util\DateTimeFormat;
 use dba;
 
 require_once 'include/dba.php';
-require_once 'include/datetime.php';
 
 class Queue
 {
@@ -20,7 +19,22 @@ class Queue
        public static function updateTime($id)
        {
                logger('queue: requeue item ' . $id);
-               dba::update('queue', ['last' => Temporal::utcNow()], ['id' => $id]);
+               $queue = dba::selectFirst('queue', ['retrial'], ['id' => $id]);
+               if (!DBM::is_result($queue)) {
+                       return;
+               }
+
+               $retrial = $queue['retrial'];
+
+               if ($retrial > 14) {
+                       self::removeItem($id);
+               }
+
+               // Calculate the delay until the next trial
+               $delay = (($retrial + 3) ** 4) + (rand(1, 30) * ($retrial + 1));
+               $next = DateTimeFormat::utc('now + ' . $delay . ' seconds');
+
+               dba::update('queue', ['last' => DateTimeFormat::utcNow(), 'retrial' => $retrial + 1, 'next' => $next], ['id' => $id]);
        }
 
        /**
@@ -67,7 +81,7 @@ class Queue
         * @param string  $msg     message
         * @param boolean $batch   batch, default false
         */
-       public static function add($cid, $network, $msg, $batch = false)
+       public static function add($cid, $network, $msg, $batch = false, $guid = '')
        {
 
                $max_queue = Config::get('system', 'max_contact_queue');
@@ -87,14 +101,23 @@ class Queue
 
                if (DBM::is_result($r)) {
                        if ($batch &&  ($r[0]['total'] > $batch_queue)) {
-                               logger('add_to_queue: too many queued items for batch server ' . $cid . ' - discarding message');
+                               logger('too many queued items for batch server ' . $cid . ' - discarding message');
                                return;
                        } elseif ((! $batch) && ($r[0]['total'] > $max_queue)) {
-                               logger('add_to_queue: too many queued items for contact ' . $cid . ' - discarding message');
+                               logger('too many queued items for contact ' . $cid . ' - discarding message');
                                return;
                        }
                }
 
-               dba::insert('queue', ['cid' => $cid, 'network' => $network, 'created' => Temporal::utcNow(), 'last' => Temporal::utcNow(), 'content' => $msg, 'batch' =>($batch) ? 1 : 0]);
+               dba::insert('queue', [
+                       'cid'     => $cid,
+                       'network' => $network,
+                       'guid'     => $guid,
+                       'created' => DateTimeFormat::utcNow(),
+                       'last'    => DateTimeFormat::utcNow(),
+                       'content' => $msg,
+                       'batch'   =>($batch) ? 1 : 0
+               ]);
+               logger('Added item ' . $guid . ' for ' . $cid);
        }
 }