X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fonepoll.php;h=951b87043e06d8a014f81ad365eb62d8b5abfdc3;hb=5e188a9250d42a82cd6b8e84d65875f3bc6067fb;hp=6fb191f73da534dff3230ac9692848a9dd897d68;hpb=f18679053b82a5a2ad2fa5ce466676891a614dbc;p=friendica.git

diff --git a/include/onepoll.php b/include/onepoll.php
index 6fb191f73d..951b87043e 100644
--- a/include/onepoll.php
+++ b/include/onepoll.php
@@ -24,14 +24,12 @@ function onepoll_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/Contact.php');
 	require_once('include/email.php');
 	require_once('include/socgraph.php');
-	require_once('include/pidfile.php');
 	require_once('include/queue_fn.php');
 
 	load_config('config');
@@ -60,18 +58,10 @@ function onepoll_run(&$argv, &$argc){
 		return;
 	}
 
-	$lockpath = get_lockpath();
-	if ($lockpath != '') {
-		$pidfile = new pidfile($lockpath, 'onepoll'.$contact_id);
-		if ($pidfile->is_already_running()) {
-			logger("onepoll: Already running for contact ".$contact_id);
-			if ($pidfile->running_time() > 9*60) {
-				$pidfile->kill();
-				logger("killed stale process");
-			}
-			exit;
-		}
-	}
+	// Don't check this stuff if the function is called by the poller
+	if (App::callstack() != "poller_run")
+		if (App::is_already_running('onepoll'.$contact_id, '', 540))
+			return;
 
 	$d = datetime_convert();
 
@@ -453,7 +443,7 @@ function onepoll_run(&$argv, &$argc){
 									$refs_arr[$x] = "'" . msgid2iri(str_replace(array('<','>',' '),array('','',''),dbesc($refs_arr[$x]))) . "'";
 							}
 							$qstr = implode(',',$refs_arr);
-							$r = q("SELECT `uri` , `parent-uri` FROM `item` WHERE `uri` IN ( $qstr ) AND `uid` = %d LIMIT 1",
+							$r = q("SELECT `uri` , `parent-uri` FROM `item` USE INDEX (`uid_uri`) WHERE `uri` IN ($qstr) AND `uid` = %d LIMIT 1",
 								intval($importer_uid)
 							);
 							if(count($r))