X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fupdate_gcontact.php;h=6aa8bcac29858e58127169e22f22388af50b2eb5;hb=7a89d06465a69ad211aabdd5e2778506a7b2f81e;hp=b7bf25aa242ae16bdf08bb63a66bcff0e26c7ba0;hpb=ec9c9f0be78f9db691ee1c7174f10a7850033717;p=friendica.git

diff --git a/include/update_gcontact.php b/include/update_gcontact.php
index b7bf25aa24..6aa8bcac29 100644
--- a/include/update_gcontact.php
+++ b/include/update_gcontact.php
@@ -1,5 +1,7 @@
 <?php
 
+use \Friendica\Core\Config;
+
 require_once("boot.php");
 
 function update_gcontact_run(&$argv, &$argc){
@@ -16,12 +18,10 @@ function update_gcontact_run(&$argv, &$argc){
 		unset($db_host, $db_user, $db_pass, $db_data);
 	};
 
-	require_once('include/pidfile.php');
 	require_once('include/Scrape.php');
 	require_once("include/socgraph.php");
 
-	load_config('config');
-	load_config('system');
+	Config::load();
 
 	$a->set_baseurl(get_config('system','url'));
 
@@ -38,20 +38,9 @@ function update_gcontact_run(&$argv, &$argc){
 	}
 
 	// Don't check this stuff if the function is called by the poller
-	if (App::callstack() != "poller_run") {
-		$lockpath = get_lockpath();
-		if ($lockpath != '') {
-			$pidfile = new pidfile($lockpath, 'update_gcontact'.$contact_id);
-			if ($pidfile->is_already_running()) {
-				logger("update_gcontact: Already running for contact ".$contact_id);
-				if ($pidfile->running_time() > 9*60) {
-					$pidfile->kill();
-					logger("killed stale process");
-				}
-				exit;
-			}
-		}
-	}
+	if (App::callstack() != "poller_run")
+		if (App::is_already_running('update_gcontact'.$contact_id, '', 540))
+			return;
 
 	$r = q("SELECT * FROM `gcontact` WHERE `id` = %d", intval($contact_id));