Merge pull request #6373 from MrPetovan/bug/6345-vier-fix-messages-notifs

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

diff --git a/src/Worker/Queue.php b/src/Worker/Queue.php
index 375267aae2ac3de85a34d499bb10204a978d43b0..7ba18ae1c2347a487344a7bdc1f449732d30272e 100644 (file)
--- a/src/Worker/Queue.php
+++ b/src/Worker/Queue.php
@@ -7,6 +7,8 @@ namespace Friendica\Worker;
 use Friendica\Core\Addon;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
+use Friendica\Core\Logger;
+use Friendica\Core\Protocol;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
@@ -18,9 +20,6 @@ use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\PortableContact;
 use Friendica\Protocol\Salmon;
 
-require_once 'include/dba.php';
-require_once 'include/items.php';
-
 class Queue
 {
        public static function execute($queue_id = 0)
@@ -31,7 +30,7 @@ class Queue
                $no_dead_check = Config::get('system', 'queue_no_dead_check', false);
 
                if (!$queue_id) {
-                       logger('filling queue jobs - start');
+                       Logger::log('filling queue jobs - start');
 
                        // Handling the pubsubhubbub requests
                        PushSubscriber::requeue();
@@ -42,11 +41,11 @@ class Queue
 
                        if (DBA::isResult($r)) {
                                foreach ($r as $q_item) {
-                                       logger('Call queue for id ' . $q_item['id']);
+                                       Logger::log('Call queue for id ' . $q_item['id']);
                                        Worker::add(['priority' => PRIORITY_LOW, 'dont_fork' => true], "Queue", (int) $q_item['id']);
                                }
                        }
-                       logger('filling queue jobs - end');
+                       Logger::log('filling queue jobs - end');
                        return;
                }
 
@@ -71,7 +70,7 @@ class Queue
                $dead = Cache::get($cachekey_deadguy . $contact['notify']);
 
                if (!is_null($dead) && $dead && !$no_dead_check) {
-                       logger('queue: skipping known dead url: ' . $contact['notify']);
+                       Logger::log('queue: skipping known dead url: ' . $contact['notify']);
                        QueueModel::updateTime($q_item['id']);
                        return;
                }
@@ -83,14 +82,14 @@ class Queue
                                $vital = Cache::get($cachekey_server . $server);
 
                                if (is_null($vital)) {
-                                       logger("Check server " . $server . " (" . $contact["network"] . ")");
+                                       Logger::log("Check server " . $server . " (" . $contact["network"] . ")");
 
                                        $vital = PortableContact::checkServer($server, $contact["network"], true);
-                                       Cache::set($cachekey_server . $server, $vital, CACHE_MINUTE);
+                                       Cache::set($cachekey_server . $server, $vital, Cache::MINUTE);
                                }
 
                                if (!is_null($vital) && !$vital) {
-                                       logger('queue: skipping dead server: ' . $server);
+                                       Logger::log('queue: skipping dead server: ' . $server);
                                        QueueModel::updateTime($q_item['id']);
                                        return;
                                }
@@ -110,30 +109,32 @@ class Queue
                $deliver_status = 0;
 
                switch ($contact['network']) {
-                       case NETWORK_DFRN:
-                               logger('queue: dfrndelivery: item ' . $q_item['id'] . ' for ' . $contact['name'] . ' <' . $contact['url'] . '>');
+                       case Protocol::DFRN:
+                               Logger::log('queue: dfrndelivery: item ' . $q_item['id'] . ' for ' . $contact['name'] . ' <' . $contact['url'] . '>');
                                $deliver_status = DFRN::deliver($owner, $contact, $data);
 
                                if (($deliver_status >= 200) && ($deliver_status <= 299)) {
                                        QueueModel::removeItem($q_item['id']);
                                } else {
                                        QueueModel::updateTime($q_item['id']);
-                                       Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_MINUTE);
+                                       Cache::set($cachekey_deadguy . $contact['notify'], true, Cache::MINUTE);
                                }
                                break;
-                       case NETWORK_OSTATUS:
-                               logger('queue: slapdelivery: item ' . $q_item['id'] . ' for ' . $contact['name'] . ' <' . $contact['url'] . '>');
+
+                       case Protocol::OSTATUS:
+                               Logger::log('queue: slapdelivery: item ' . $q_item['id'] . ' for ' . $contact['name'] . ' <' . $contact['url'] . '>');
                                $deliver_status = Salmon::slapper($owner, $contact['notify'], $data);
 
                                if ($deliver_status == -1) {
                                        QueueModel::updateTime($q_item['id']);
-                                       Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_MINUTE);
+                                       Cache::set($cachekey_deadguy . $contact['notify'], true, Cache::MINUTE);
                                } else {
                                        QueueModel::removeItem($q_item['id']);
                                }
                                break;
-                       case NETWORK_DIASPORA:
-                               logger('queue: diaspora_delivery: item ' . $q_item['id'] . ' for ' . $contact['name'] . ' <' . $contact['url'] . '>');
+
+                       case Protocol::DIASPORA:
+                               Logger::log('queue: diaspora_delivery: item ' . $q_item['id'] . ' for ' . $contact['name'] . ' <' . $contact['url'] . '>');
                                $deliver_status = Diaspora::transmit($owner, $contact, $data, $public, true, 'Queue:' . $q_item['id'], true);
 
                                if ((($deliver_status >= 200) && ($deliver_status <= 299)) ||
@@ -141,7 +142,7 @@ class Queue
                                        QueueModel::removeItem($q_item['id']);
                                } else {
                                        QueueModel::updateTime($q_item['id']);
-                                       Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_MINUTE);
+                                       Cache::set($cachekey_deadguy . $contact['notify'], true, Cache::MINUTE);
                                }
                                break;
 
@@ -156,7 +157,7 @@ class Queue
                                }
                                break;
                }
-               logger('Deliver status ' . (int)$deliver_status . ' for item ' . $q_item['id'] . ' to ' . $contact['name'] . ' <' . $contact['url'] . '>');
+               Logger::log('Deliver status ' . (int)$deliver_status . ' for item ' . $q_item['id'] . ' to ' . $contact['name'] . ' <' . $contact['url'] . '>');
 
                return;
        }