X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FQueue.php;h=7ffc64bf9e56af603d438882218e805c418c4dfc;hb=64887387906e9774ef1810c0029353086bcda43b;hp=df8038c0dba1c6a58c1c1872664dd9e65ceff2a6;hpb=d70a20a46627b2edbc53f422bc9dd85dea8eea35;p=friendica.git

diff --git a/src/Model/Queue.php b/src/Model/Queue.php
index df8038c0db..7ffc64bf9e 100644
--- a/src/Model/Queue.php
+++ b/src/Model/Queue.php
@@ -5,9 +5,9 @@
 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';
 
@@ -18,9 +18,9 @@ class Queue
 	 */
 	public static function updateTime($id)
 	{
-		logger('queue: requeue item ' . $id);
-		$queue = dba::selectFirst('queue', ['retrial'], ['id' => $id]);
-		if (!DBM::is_result($queue)) {
+		Logger::log('queue: requeue item ' . $id);
+		$queue = DBA::selectFirst('queue', ['retrial'], ['id' => $id]);
+		if (!DBA::isResult($queue)) {
 			return;
 		}
 
@@ -32,9 +32,9 @@ class Queue
 
 		// Calculate the delay until the next trial
 		$delay = (($retrial + 3) ** 4) + (rand(1, 30) * ($retrial + 1));
-		$next = DateTimeFormat::utc(date('c', time() + $delay));
+		$next = DateTimeFormat::utc('now + ' . $delay . ' seconds');
 
-		dba::update('queue', ['last' => DateTimeFormat::utcNow(), 'retrial' => $retrial + 1, 'next' => $next], ['id' => $id]);
+		DBA::update('queue', ['last' => DateTimeFormat::utcNow(), 'retrial' => $retrial + 1, 'next' => $next], ['id' => $id]);
 	}
 
 	/**
@@ -42,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]);
 	}
 
 	/**
@@ -61,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.
@@ -69,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;
@@ -99,17 +99,17 @@ class Queue
 			intval($cid)
 		);
 
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			if ($batch &&  ($r[0]['total'] > $batch_queue)) {
-				logger('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('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,
@@ -118,6 +118,6 @@ class Queue
 			'content' => $msg,
 			'batch'   =>($batch) ? 1 : 0
 		]);
-		logger('Added item ' . $guid . ' for ' . $cid);
+		Logger::log('Added item ' . $guid . ' for ' . $cid);
 	}
 }