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

diff --git a/include/queue.php b/include/queue.php
index 1525ca3abf..9779a0733d 100644
--- a/include/queue.php
+++ b/include/queue.php
@@ -22,26 +22,15 @@ 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');
 	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'));
 
@@ -59,7 +48,7 @@ function queue_run(&$argv, &$argc){
 	logger('queue: start');
 
 	// Handling the pubsubhubbub requests
-	proc_run('php','include/pubsubpublish.php');
+	proc_run(PRIORITY_HIGH,'include/pubsubpublish.php');
 
 	$interval = ((get_config('system','delivery_interval') === false) ? 2 : intval(get_config('system','delivery_interval')));
 
@@ -71,7 +60,7 @@ function queue_run(&$argv, &$argc){
 	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);
 		}
@@ -204,7 +193,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']);