X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fqueue.php;h=9779a0733d3f65bcb5916fe37beefccacaf86f6d;hb=074ae59f49ddaae9d699a1e32537cb71c2c7590e;hp=7e92705be27db7e639c547b8a6c2a45853aeef96;hpb=aaf5a81365b4cbcb3d1b9537b5544aeb5de66f4b;p=friendica.git

diff --git a/include/queue.php b/include/queue.php
index 7e92705be2..9779a0733d 100644
--- a/include/queue.php
+++ b/include/queue.php
@@ -1,30 +1,37 @@
 <?php
 require_once("boot.php");
 require_once('include/queue_fn.php');
+require_once('include/dfrn.php');
 
-function queue_run($argv, $argc){
+function queue_run(&$argv, &$argc){
 	global $a, $db;
 
 	if(is_null($a)){
 		$a = new App;
 	}
-  
+
 	if(is_null($db)){
 		@include(".htconfig.php");
-		require_once("dba.php");
+		require_once("include/dba.php");
 		$db = new dba($db_host, $db_user, $db_pass, $db_data);
 		unset($db_host, $db_user, $db_pass, $db_data);
 	};
 
 
-	require_once("session.php");
-	require_once("datetime.php");
+	require_once("include/session.php");
+	require_once("include/datetime.php");
 	require_once('include/items.php');
 	require_once('include/bbcode.php');
+	require_once('include/socgraph.php');
 
 	load_config('config');
 	load_config('system');
 
+	// 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'));
 
 	load_hooks();
@@ -35,32 +42,41 @@ function queue_run($argv, $argc){
 		$queue_id = 0;
 
 	$deadguys = array();
+	$deadservers = array();
+	$serverlist = array();
 
 	logger('queue: start');
 
+	// 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')));
 
+	// 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(count($r)) {
+	if($r) {
 		foreach($r as $rr) {
 			logger('queue: deliverq');
-			proc_run('php','include/delivery.php',$rr['cmd'],$rr['item'],$rr['contact']);
+			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` 
-		LEFT JOIN `contact` ON `queue`.`cid` = `contact`.`id` 
+	$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(count($r)) {
+	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");
 	}
-		
+
 	if($queue_id) {
 		$r = q("SELECT `id` FROM `queue` WHERE `id` = %d LIMIT 1",
 			intval($queue_id)
@@ -69,11 +85,11 @@ function queue_run($argv, $argc){
 	else {
 
 		// For the first 12 hours we'll try to deliver every 15 minutes
-		// After that, we'll only attempt delivery once per hour. 
+		// 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 ))");
+		$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`");
 	}
-	if(! count($r)){
+	if(! $r){
 		return;
 	}
 
@@ -88,11 +104,11 @@ function queue_run($argv, $argc){
 
 	foreach($r as $q_item) {
 
-		// queue_predeliver hooks may have changed the queue db details, 
+		// queue_predeliver hooks may have changed the queue db details,
 		// so check again if this entry still needs processing
 
 		if($queue_id) {
-			$qi = q("select * from queue where `id` = %d limit 1",
+			$qi = q("SELECT * FROM `queue` WHERE `id` = %d LIMIT 1",
 				intval($queue_id)
 			);
 		}
@@ -113,12 +129,28 @@ function queue_run($argv, $argc){
 			continue;
 		}
 		if(in_array($c[0]['notify'],$deadguys)) {
-				logger('queue: skipping known dead url: ' . $c[0]['notify']);
-				update_queue_time($q_item['id']);
-				continue;
+			logger('queue: skipping known dead url: ' . $c[0]['notify']);
+			update_queue_time($q_item['id']);
+			continue;
+		}
+
+		$server = poco_detect_server($c[0]['url']);
+
+		if (($server != "") AND !in_array($server, $serverlist)) {
+			logger("Check server ".$server." (".$c[0]["network"].")");
+			if (!poco_check_server($server, $c[0]["network"], true))
+				$deadservers[] = $server;
+
+			$serverlist[] = $server;
+		}
+
+		if (($server != "") AND in_array($server, $deadservers)) {
+			logger('queue: skipping known dead server: '.$server);
+			update_queue_time($q_item['id']);
+			continue;
 		}
 
-		$u = q("SELECT `user`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey` 
+		$u = q("SELECT `user`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`
 			FROM `user` WHERE `uid` = %d LIMIT 1",
 			intval($c[0]['uid'])
 		);
@@ -136,59 +168,62 @@ function queue_run($argv, $argc){
 
 		switch($contact['network']) {
 			case NETWORK_DFRN:
-				logger('queue: dfrndelivery: item ' . $q_item['id'] . ' for ' . $contact['name']);
-				$deliver_status = dfrn_deliver($owner,$contact,$data);
+				logger('queue: dfrndelivery: item '.$q_item['id'].' for '.$contact['name'].' <'.$contact['url'].'>');
+				$deliver_status = dfrn::deliver($owner,$contact,$data);
 
 				if($deliver_status == (-1)) {
 					update_queue_time($q_item['id']);
 					$deadguys[] = $contact['notify'];
-				}
-				else {
+				} else
 					remove_queue_item($q_item['id']);
-				}
+
 				break;
 			case NETWORK_OSTATUS:
 				if($contact['notify']) {
-					logger('queue: slapdelivery: item ' . $q_item['id'] . ' for ' . $contact['name']);
+					logger('queue: slapdelivery: item '.$q_item['id'].' for '.$contact['name'].' <'.$contact['url'].'>');
 					$deliver_status = slapper($owner,$contact['notify'],$data);
 
-					if($deliver_status == (-1))
+					if($deliver_status == (-1)) {
 						update_queue_time($q_item['id']);
-					else
+						$deadguys[] = $contact['notify'];
+					} else
 						remove_queue_item($q_item['id']);
 				}
 				break;
 			case NETWORK_DIASPORA:
 				if($contact['notify']) {
-					logger('queue: diaspora_delivery: item ' . $q_item['id'] . ' for ' . $contact['name']);
-					$deliver_status = diaspora_transmit($owner,$contact,$data,$public);
+					logger('queue: diaspora_delivery: item '.$q_item['id'].' for '.$contact['name'].' <'.$contact['url'].'>');
+					$deliver_status = diaspora::transmit($owner,$contact,$data,$public,true);
 
-					if($deliver_status == (-1))
+					if($deliver_status == (-1)) {
 						update_queue_time($q_item['id']);
-					else
+						$deadguys[] = $contact['notify'];
+					} else
 						remove_queue_item($q_item['id']);
+
 				}
 				break;
 
 			default:
 				$params = array('owner' => $owner, 'contact' => $contact, 'queue' => $q_item, 'result' => false);
 				call_hooks('queue_deliver', $a, $params);
-		
+
 				if($params['result'])
-						remove_queue_item($q_item['id']);
+					remove_queue_item($q_item['id']);
 				else
-						update_queue_time($q_item['id']);
-	
+					update_queue_time($q_item['id']);
+
 				break;
 
 		}
+		logger('Deliver status '.$deliver_status.' for item '.$q_item['id'].' to '.$contact['name'].' <'.$contact['url'].'>');
 	}
-		
+
 	return;
 
 }
 
 if (array_search(__file__,get_included_files())===0){
-  queue_run($argv,$argc);
+  queue_run($_SERVER["argv"],$_SERVER["argc"]);
   killme();
 }