X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fqueue.php;h=128dfcba57dd25dc18e8d339468680f5aa03551a;hb=cbe4e2bf8c7b6fea2e700811a15b427e6141c9dd;hp=2cc16282344b3193e4971d931974ba28e0c6769e;hpb=e0cf2c5167f29efcd8923f40bade346fe44c4ef3;p=friendica.git

diff --git a/include/queue.php b/include/queue.php
index 2cc1628234..128dfcba57 100644
--- a/include/queue.php
+++ b/include/queue.php
@@ -46,7 +46,7 @@ function handle_pubsubhubbub() {
 			// we use the push variable also as a counter, if we failed we
 			// increment this until some upper limit where we give up
 			$new_push = intval($rr['push']) + 1;
-			
+
 			if ($new_push > 30) // OK, let's give up
 				$new_push = 0;
 
@@ -66,7 +66,7 @@ function queue_run(&$argv, &$argc){
 	if(is_null($a)){
 		$a = new App;
 	}
-  
+
 	if(is_null($db)){
 		@include(".htconfig.php");
 		require_once("include/dba.php");
@@ -79,10 +79,26 @@ function queue_run(&$argv, &$argc){
 	require_once("include/datetime.php");
 	require_once('include/items.php');
 	require_once('include/bbcode.php');
+	require_once('include/pidfile.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");
+			}
+			return;
+		}
+	}
+
 	$a->set_baseurl(get_config('system','url'));
 
 	load_hooks();
@@ -111,7 +127,7 @@ function queue_run(&$argv, &$argc){
 	}
 
 	$r = q("SELECT `queue`.*, `contact`.`name`, `contact`.`uid` FROM `queue` 
-		LEFT JOIN `contact` ON `queue`.`cid` = `contact`.`id` 
+		INNER JOIN `contact` ON `queue`.`cid` = `contact`.`id` 
 		WHERE `queue`.`created` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
 	if($r) {
 		foreach($r as $rr) {
@@ -120,7 +136,7 @@ function queue_run(&$argv, &$argc){
 		}
 		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)
@@ -233,22 +249,22 @@ function queue_run(&$argv, &$argc){
 			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']);
 				else
 						update_queue_time($q_item['id']);
-	
+
 				break;
 
 		}
 	}
-		
+
 	return;
 
 }
 
 if (array_search(__file__,get_included_files())===0){
-  queue_run($argv,$argc);
+  queue_run($_SERVER["argv"],$_SERVER["argc"]);
   killme();
 }