X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fqueue.php;h=c930cd9cff5449e5686d8fab55fdee2ff8a450a0;hb=9e99066fd70a9dd9a291a523afba1a390f0e3a0b;hp=f721326f06e4049bf97de210377168e7183c4402;hpb=ea88e15a8cc10f99621720ca0e5a9598d0e64e0f;p=friendica.git

diff --git a/include/queue.php b/include/queue.php
index f721326f06..c930cd9cff 100644
--- a/include/queue.php
+++ b/include/queue.php
@@ -1,9 +1,12 @@
 <?php
 
 use Friendica\Core\Config;
+use Friendica\Core\Worker;
+use Friendica\Database\DBM;
+use Friendica\Protocol\Diaspora;
+use Friendica\Protocol\DFRN;
 
 require_once 'include/queue_fn.php';
-require_once 'include/dfrn.php';
 require_once 'include/datetime.php';
 require_once 'include/items.php';
 require_once 'include/bbcode.php';
@@ -27,13 +30,13 @@ function queue_run(&$argv, &$argc) {
 		logger('queue: start');
 
 		// Handling the pubsubhubbub requests
-		proc_run(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), 'include/pubsubpublish.php');
+		Worker::add(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), 'pubsubpublish');
 
 		$r = q("SELECT `queue`.*, `contact`.`name`, `contact`.`uid` FROM `queue`
 			INNER JOIN `contact` ON `queue`.`cid` = `contact`.`id`
 			WHERE `queue`.`created` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			foreach ($r as $rr) {
 				logger('Removing expired queue item for ' . $rr['name'] . ', uid=' . $rr['uid']);
 				logger('Expired queue data: ' . $rr['content'], LOGGER_DATA);
@@ -49,10 +52,10 @@ function queue_run(&$argv, &$argc) {
 
 		call_hooks('queue_predeliver', $a, $r);
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			foreach ($r as $q_item) {
 				logger('Call queue for id '.$q_item['id']);
-				proc_run(array('priority' => PRIORITY_LOW, 'dont_fork' => true), "include/queue.php", $q_item['id']);
+				Worker::add(array('priority' => PRIORITY_LOW, 'dont_fork' => true), "queue", (int)$q_item['id']);
 			}
 		}
 		return;
@@ -62,12 +65,11 @@ function queue_run(&$argv, &$argc) {
 	// delivering
 
 	require_once 'include/salmon.php';
-	require_once 'include/diaspora.php';
 
 	$r = q("SELECT * FROM `queue` WHERE `id` = %d LIMIT 1",
 		intval($queue_id));
 
-	if (!dbm::is_result($r)) {
+	if (!DBM::is_result($r)) {
 		return;
 	}
 
@@ -77,7 +79,7 @@ function queue_run(&$argv, &$argc) {
 		intval($q_item['cid'])
 	);
 
-	if (!dbm::is_result($c)) {
+	if (!DBM::is_result($c)) {
 		remove_queue_item($q_item['id']);
 		return;
 	}
@@ -113,7 +115,7 @@ function queue_run(&$argv, &$argc) {
 		FROM `user` WHERE `uid` = %d LIMIT 1",
 		intval($c[0]['uid'])
 	);
-	if (!dbm::is_result($u)) {
+	if (!DBM::is_result($u)) {
 		remove_queue_item($q_item['id']);
 		return;
 	}
@@ -128,7 +130,7 @@ function queue_run(&$argv, &$argc) {
 	switch ($contact['network']) {
 		case NETWORK_DFRN:
 			logger('queue: dfrndelivery: item '.$q_item['id'].' for '.$contact['name'].' <'.$contact['url'].'>');
-			$deliver_status = dfrn::deliver($owner, $contact, $data);
+			$deliver_status = DFRN::deliver($owner, $contact, $data);
 
 			if ($deliver_status == (-1)) {
 				update_queue_time($q_item['id']);