X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FQueue.php;h=7ba18ae1c2347a487344a7bdc1f449732d30272e;hb=3f85ee3ef8348dd2200c7bb05be6701689a649d5;hp=6cad9ac53f8d8ecb00bcde5dbc2028da1bda3122;hpb=49c7b5481b2001311daa371615a352c433a01c06;p=friendica.git

diff --git a/src/Worker/Queue.php b/src/Worker/Queue.php
index 6cad9ac53f..7ba18ae1c2 100644
--- a/src/Worker/Queue.php
+++ b/src/Worker/Queue.php
@@ -7,6 +7,7 @@ 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;
@@ -19,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)
@@ -32,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();
@@ -43,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;
 		}
 
@@ -72,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;
 		}
@@ -84,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);
 				}
 
 				if (!is_null($vital) && !$vital) {
-					logger('queue: skipping dead server: ' . $server);
+					Logger::log('queue: skipping dead server: ' . $server);
 					QueueModel::updateTime($q_item['id']);
 					return;
 				}
@@ -112,7 +110,7 @@ class Queue
 
 		switch ($contact['network']) {
 			case Protocol::DFRN:
-				logger('queue: dfrndelivery: item ' . $q_item['id'] . ' for ' . $contact['name'] . ' <' . $contact['url'] . '>');
+				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)) {
@@ -124,7 +122,7 @@ class Queue
 				break;
 
 			case Protocol::OSTATUS:
-				logger('queue: slapdelivery: item ' . $q_item['id'] . ' for ' . $contact['name'] . ' <' . $contact['url'] . '>');
+				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) {
@@ -136,7 +134,7 @@ class Queue
 				break;
 
 			case Protocol::DIASPORA:
-				logger('queue: diaspora_delivery: item ' . $q_item['id'] . ' for ' . $contact['name'] . ' <' . $contact['url'] . '>');
+				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)) ||
@@ -159,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;
 	}