X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FQueue.php;h=b2c002574c9f871426a9019cc4c7b951c93396d5;hb=df230126c937985fb74d4d3ea93a963fae4cd0b6;hp=99ba6385c1680d783712ab749e01dd59fb180e23;hpb=dc366bf1f7b5b7b0fc1c1a86772783074b301993;p=friendica.git

diff --git a/src/Model/Queue.php b/src/Model/Queue.php
index 99ba6385c1..b2c002574c 100644
--- a/src/Model/Queue.php
+++ b/src/Model/Queue.php
@@ -5,12 +5,9 @@
 namespace Friendica\Model;
 
 use Friendica\Core\Config;
-use Friendica\Database\DBM;
-use Friendica\Util\Temporal;
-use dba;
-
-require_once 'include/dba.php';
-require_once 'include/datetime.php';
+use Friendica\Core\Logger;
+use Friendica\Database\DBA;
+use Friendica\Util\DateTimeFormat;
 
 class Queue
 {
@@ -19,8 +16,23 @@ class Queue
 	 */
 	public static function updateTime($id)
 	{
-		logger('queue: requeue item ' . $id);
-		dba::update('queue', ['last' => Temporal::convert()], ['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 +40,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 +59,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 +67,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 +79,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,16 +97,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', ['cid' => $cid, 'network' => $network, 'created' => Temporal::convert(), 'last' => Temporal::convert(), '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::log('Added item ' . $guid . ' for ' . $cid);
 	}
 }