X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FQueue.php;h=8b9e801c3ffc616af346e94322b4be112bbcc74c;hb=1e96faca4c9825bf6a8d8a50dc37498b764b9a3d;hp=3c262ddb08507d9f56ef476cd325010e389e176a;hpb=33ac7a529fbfd6d389bd836d18550235ebc3b50d;p=friendica.git

diff --git a/src/Model/Queue.php b/src/Model/Queue.php
index 3c262ddb08..8b9e801c3f 100644
--- a/src/Model/Queue.php
+++ b/src/Model/Queue.php
@@ -6,10 +6,10 @@ namespace Friendica\Model;
 
 use Friendica\Core\Config;
 use Friendica\Database\DBM;
+use Friendica\Util\DateTimeFormat;
 use dba;
 
 require_once 'include/dba.php';
-require_once 'include/datetime.php';
 
 class Queue
 {
@@ -19,9 +19,24 @@ class Queue
 	public static function updateTime($id)
 	{
 		logger('queue: requeue item ' . $id);
-		dba::update('queue', ['last' => datetime_convert()], ['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]);
 	}
-	
+
 	/**
 	 * @param string $id id
 	 */
@@ -30,7 +45,7 @@ class Queue
 		logger('queue: remove queue item ' . $id);
 		dba::delete('queue', ['id' => $id]);
 	}
-	
+
 	/**
 	 * @brief Checks if the communication with a given contact had problems recently
 	 *
@@ -45,9 +60,9 @@ class Queue
 			AND `last` > UTC_TIMESTAMP() - INTERVAL 15 MINUTE LIMIT 1",
 			intval($cid)
 		);
-	
+
 		$was_delayed = DBM::is_result($r);
-	
+
 		// We set "term-date" to a current date if the communication has problems.
 		// If the communication works again we reset this value.
 		if ($was_delayed) {
@@ -56,29 +71,29 @@ class Queue
 			);
 			$was_delayed = !DBM::is_result($r);
 		}
-	
+
 		return $was_delayed;
 	}
-	
+
 	/**
 	 * @param string  $cid     cid
 	 * @param string  $network network
 	 * @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');
 		if ($max_queue < 1) {
 			$max_queue = 500;
 		}
-	
+
 		$batch_queue = Config::get('system', 'max_batch_queue');
 		if ($batch_queue < 1) {
 			$batch_queue = 1000;
 		}
-	
+
 		$r = q("SELECT COUNT(*) AS `total` FROM `queue` INNER JOIN `contact` ON `queue`.`cid` = `contact`.`id`
 			WHERE `queue`.`cid` = %d AND `contact`.`self` = 0 ",
 			intval($cid)
@@ -86,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' => datetime_convert(), 'last' => datetime_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('Added item ' . $guid . ' for ' . $cid);
 	}
 }