Merge pull request #6321 from MrPetovan/bug/6316-escape-event-output

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

diff --git a/src/Model/Queue.php b/src/Model/Queue.php
index da7a8b3e58c126740cc73cf21dfe022715c5bec7..7ffc64bf9e56af603d438882218e805c418c4dfc 100644 (file)
--- a/src/Model/Queue.php
+++ b/src/Model/Queue.php
@@ -5,12 +5,11 @@
 namespace Friendica\Model;
 
 use Friendica\Core\Config;
-use Friendica\Database\DBM;
+use Friendica\Core\Logger;
+use Friendica\Database\DBA;
 use Friendica\Util\DateTimeFormat;
-use dba;
 
 require_once 'include/dba.php';
-require_once 'include/datetime.php';
 
 class Queue
 {
@@ -19,8 +18,23 @@ class Queue
         */
        public static function updateTime($id)
        {
-               logger('queue: requeue item ' . $id);
-               dba::update('queue', ['last' => DateTimeFormat::utcNow()], ['id' => $id]);
+               Logger::log('queue: requeue item ' . $id);
+               $queue = DBA::selectFirst('queue', ['retrial'], ['id' => $id]);
+               if (!DBA::isResult($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]);
        }
 
        /**
@@ -28,8 +42,8 @@ class Queue
         */
        public static function removeItem($id)
        {
-               logger('queue: remove queue item ' . $id);
-               dba::delete('queue', ['id' => $id]);
+               Logger::log('queue: remove queue item ' . $id);
+               DBA::delete('queue', ['id' => $id]);
        }
 
        /**
@@ -47,7 +61,7 @@ class Queue
                        intval($cid)
                );
 
-               $was_delayed = DBM::is_result($r);
+               $was_delayed = DBA::isResult($r);
 
                // We set "term-date" to a current date if the communication has problems.
                // If the communication works again we reset this value.
@@ -55,7 +69,7 @@ class Queue
                        $r = q("SELECT `term-date` FROM `contact` WHERE `id` = %d AND `term-date` <= '1000-01-01' LIMIT 1",
                                intval($cid)
                        );
-                       $was_delayed = !DBM::is_result($r);
+                       $was_delayed = !DBA::isResult($r);
                }
 
                return $was_delayed;
@@ -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');
@@ -85,23 +99,25 @@ class Queue
                        intval($cid)
                );
 
-               if (DBM::is_result($r)) {
+               if (DBA::isResult($r)) {
                        if ($batch &&  ($r[0]['total'] > $batch_queue)) {
-                               logger('add_to_queue: too many queued items for batch server ' . $cid . ' - discarding message');
+                               Logger::log('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::log('too many queued items for contact ' . $cid . ' - discarding message');
                                return;
                        }
                }
 
-               dba::insert('queue', [
+               DBA::insert('queue', [
                        'cid'     => $cid,
                        'network' => $network,
+                       'guid'     => $guid,
                        'created' => DateTimeFormat::utcNow(),
                        'last'    => DateTimeFormat::utcNow(),
                        'content' => $msg,
                        'batch'   =>($batch) ? 1 : 0
                ]);
+               Logger::log('Added item ' . $guid . ' for ' . $cid);
        }
 }