Changed log calls

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

diff --git a/src/Model/Queue.php b/src/Model/Queue.php
index 0110ed050f8f7a684941f9e3c8958a680dab3094..355433492ca074b5965fec72c78921b5855f9fba 100644 (file)
--- a/src/Model/Queue.php
+++ b/src/Model/Queue.php
@@ -5,21 +5,21 @@
 namespace Friendica\Model;
 
 use Friendica\Core\Config;
+use Friendica\Core\Logger;
 use Friendica\Database\DBA;
 use Friendica\Util\DateTimeFormat;
 
-require_once 'include/dba.php';
-
 class Queue
 {
        /**
         * @param string $id id
+        * @throws \Exception
         */
        public static function updateTime($id)
        {
-               logger('queue: requeue item ' . $id);
+               Logger::log('queue: requeue item ' . $id);
                $queue = DBA::selectFirst('queue', ['retrial'], ['id' => $id]);
-               if (!DBA::is_result($queue)) {
+               if (!DBA::isResult($queue)) {
                        return;
                }
 
@@ -38,10 +38,11 @@ class Queue
 
        /**
         * @param string $id id
+        * @throws \Exception
         */
        public static function removeItem($id)
        {
-               logger('queue: remove queue item ' . $id);
+               Logger::log('queue: remove queue item ' . $id);
                DBA::delete('queue', ['id' => $id]);
        }
 
@@ -51,6 +52,7 @@ class Queue
         * @param int $cid Contact id
         *
         * @return bool The communication with this contact has currently problems
+        * @throws \Exception
         */
        public static function wasDelayed($cid)
        {
@@ -60,7 +62,7 @@ class Queue
                        intval($cid)
                );
 
-               $was_delayed = DBA::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.
@@ -68,7 +70,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 = !DBA::is_result($r);
+                       $was_delayed = !DBA::isResult($r);
                }
 
                return $was_delayed;
@@ -79,6 +81,8 @@ class Queue
         * @param string  $network network
         * @param string  $msg     message
         * @param boolean $batch   batch, default false
+        * @param string  $guid
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        public static function add($cid, $network, $msg, $batch = false, $guid = '')
        {
@@ -98,12 +102,12 @@ class Queue
                        intval($cid)
                );
 
-               if (DBA::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;
                        }
                }
@@ -117,6 +121,6 @@ class Queue
                        'content' => $msg,
                        'batch'   =>($batch) ? 1 : 0
                ]);
-               logger('Added item ' . $guid . ' for ' . $cid);
+               Logger::log('Added item ' . $guid . ' for ' . $cid);
        }
 }