X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fqueue.php;h=ad7079e959ebce2d3a767167bb69e7a0ce693f2b;hb=b010a7db0d0073fc1bf0825e73a295d0bbeb9ada;hp=f40768f0d0b26abfbb5559f323eff611725c7809;hpb=fe5705e5473c358359e6c78d596d4ad3d866cc26;p=friendica.git

diff --git a/include/queue.php b/include/queue.php
index f40768f0d0..ad7079e959 100644
--- a/include/queue.php
+++ b/include/queue.php
@@ -1,6 +1,7 @@
 <?php
 require_once("boot.php");
 require_once('include/queue_fn.php');
+require_once('include/dfrn.php');
 
 function queue_run(&$argv, &$argc){
 	global $a, $db;
@@ -16,31 +17,19 @@ function queue_run(&$argv, &$argc){
 		unset($db_host, $db_user, $db_pass, $db_data);
 	};
 
-
 	require_once("include/session.php");
 	require_once("include/datetime.php");
 	require_once('include/items.php');
 	require_once('include/bbcode.php');
-	require_once('include/pidfile.php');
 	require_once('include/socgraph.php');
 
 	load_config('config');
 	load_config('system');
 
-	$lockpath = get_lockpath();
-	if ($lockpath != '') {
-		$pidfile = new pidfile($lockpath, 'queue');
-		if($pidfile->is_already_running()) {
-			logger("queue: Already running");
-			if ($pidfile->running_time() > 9*60) {
-				$pidfile->kill();
-				logger("queue: killed stale process");
-				// Calling a new instance
-				proc_run('php',"include/queue.php");
-			}
+	// Don't check this stuff if the function is called by the poller
+	if (App::callstack() != "poller_run")
+		if (App::is_already_running('queue', 'include/queue.php', 540))
 			return;
-		}
-	}
 
 	$a->set_baseurl(get_config('system','url'));
 
@@ -55,55 +44,57 @@ function queue_run(&$argv, &$argc){
 	$deadservers = array();
 	$serverlist = array();
 
-	logger('queue: start');
+	if (!$queue_id) {
+
+		logger('queue: start');
 
-	// Handling the pubsubhubbub requests
-	proc_run('php','include/pubsubpublish.php');
+		// Handling the pubsubhubbub requests
+		proc_run(PRIORITY_HIGH,'include/pubsubpublish.php');
 
-	$interval = ((get_config('system','delivery_interval') === false) ? 2 : intval(get_config('system','delivery_interval')));
+		$interval = ((get_config('system','delivery_interval') === false) ? 2 : intval(get_config('system','delivery_interval')));
 
-	// If we are using the worker we don't need a delivery interval
-	if (get_config("system", "worker"))
-		$interval = false;
+		// If we are using the worker we don't need a delivery interval
+		if (get_config("system", "worker"))
+			$interval = false;
 
-	$r = q("select * from deliverq where 1");
-	if($r) {
-		foreach($r as $rr) {
-			logger('queue: deliverq');
-			proc_run('php','include/delivery.php',$rr['cmd'],$rr['item'],$rr['contact']);
-			if($interval)
+		$r = q("select * from deliverq where 1");
+		if($r) {
+			foreach($r as $rr) {
+				logger('queue: deliverq');
+				proc_run(PRIORITY_HIGH,'include/delivery.php',$rr['cmd'],$rr['item'],$rr['contact']);
+				if($interval)
 				@time_sleep_until(microtime(true) + (float) $interval);
+			}
 		}
-	}
 
-	$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($r) {
-		foreach($r as $rr) {
-			logger('Removing expired queue item for ' . $rr['name'] . ', uid=' . $rr['uid']);
-			logger('Expired queue data :' . $rr['content'], LOGGER_DATA);
+		$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($r) {
+			foreach($r as $rr) {
+				logger('Removing expired queue item for ' . $rr['name'] . ', uid=' . $rr['uid']);
+				logger('Expired queue data :' . $rr['content'], LOGGER_DATA);
+			}
+			q("DELETE FROM `queue` WHERE `created` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
 		}
-		q("DELETE FROM `queue` WHERE `created` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
-	}
-
-	if($queue_id) {
-		$r = q("SELECT `id` FROM `queue` WHERE `id` = %d LIMIT 1",
-			intval($queue_id)
-		);
-	}
-	else {
 
 		// For the first 12 hours we'll try to deliver every 15 minutes
 		// After that, we'll only attempt delivery once per hour.
 
 		$r = q("SELECT `id` FROM `queue` WHERE ((`created` > UTC_TIMESTAMP() - INTERVAL 12 HOUR && `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE) OR (`last` < UTC_TIMESTAMP() - INTERVAL 1 HOUR)) ORDER BY `cid`, `created`");
+	} else {
+		logger('queue: start for id '.$queue_id);
+
+		$r = q("SELECT `id` FROM `queue` WHERE `id` = %d LIMIT 1",
+			intval($queue_id)
+		);
 	}
-	if(! $r){
+
+	if (!$r){
 		return;
 	}
 
-	if(! $queue_id)
+	if (!$queue_id)
 		call_hooks('queue_predeliver', $a, $r);
 
 
@@ -117,16 +108,17 @@ function queue_run(&$argv, &$argc){
 		// queue_predeliver hooks may have changed the queue db details,
 		// so check again if this entry still needs processing
 
-		if($queue_id) {
+		if($queue_id)
 			$qi = q("SELECT * FROM `queue` WHERE `id` = %d LIMIT 1",
-				intval($queue_id)
-			);
-		}
-		else {
+				intval($queue_id));
+		elseif (get_config("system", "worker")) {
+			logger('Call queue for id '.$q_item['id']);
+			proc_run(PRIORITY_LOW, "include/queue.php", $q_item['id']);
+			continue;
+		} else
 			$qi = q("SELECT * FROM `queue` WHERE `id` = %d AND `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE ",
-				intval($q_item['id'])
-			);
-		}
+				intval($q_item['id']));
+
 		if(! count($qi))
 			continue;
 
@@ -179,7 +171,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']);
@@ -203,7 +195,7 @@ function queue_run(&$argv, &$argc){
 			case NETWORK_DIASPORA:
 				if($contact['notify']) {
 					logger('queue: diaspora_delivery: item '.$q_item['id'].' for '.$contact['name'].' <'.$contact['url'].'>');
-					$deliver_status = diaspora_transmit($owner,$contact,$data,$public,true);
+					$deliver_status = diaspora::transmit($owner,$contact,$data,$public,true);
 
 					if($deliver_status == (-1)) {
 						update_queue_time($q_item['id']);