Merge pull request #3902 from annando/worker-space

[friendica.git] / include / queue_fn.php

diff --git a/include/queue_fn.php b/include/queue_fn.php
index 9dcefdd244b59288c9177a401735d186480a680b..e6fd14e07ca5dc1c7802c05bd52108bff764f4e1 100644 (file)
--- a/include/queue_fn.php
+++ b/include/queue_fn.php
@@ -1,5 +1,8 @@
 <?php
 
+use Friendica\Core\Config;
+use Friendica\Database\DBM;
+
 function update_queue_time($id) {
        logger('queue: requeue item ' . $id);
        q("UPDATE `queue` SET `last` = '%s' WHERE `id` = %d",
@@ -31,7 +34,7 @@ function was_recently_delayed($cid) {
                intval($cid)
        );
 
-       $was_delayed = dbm::is_result($r);
+       $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.
@@ -39,7 +42,7 @@ function was_recently_delayed($cid) {
                $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 = !DBM::is_result($r);
        }
 
        return $was_delayed;
@@ -48,24 +51,25 @@ function was_recently_delayed($cid) {
 
 function add_to_queue($cid,$network,$msg,$batch = false) {
 
-       $max_queue = get_config('system','max_contact_queue');
-       if($max_queue < 1)
+       $max_queue = Config::get('system','max_contact_queue');
+       if ($max_queue < 1) {
                $max_queue = 500;
+       }
 
-       $batch_queue = get_config('system','max_batch_queue');
-       if($batch_queue < 1)
+       $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)
        );
-       if (dbm::is_result($r)) {
-               if($batch &&  ($r[0]['total'] > $batch_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');
                        return;
-               }
-               elseif((! $batch) && ($r[0]['total'] > $max_queue)) {
+               } elseif ((! $batch) && ($r[0]['total'] > $max_queue)) {
                        logger('add_to_queue: too many queued items for contact ' . $cid . ' - discarding message');
                        return;
                }