X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fupdate_gcontact.php;h=88e1817f0b991ff6a0749c2d794b71510ab62b22;hb=9899c30d0f90cdefa5fca09016bf3ed47794ec18;hp=ce2323f1873c1537e36e5b1ec0314cf28f830d7b;hpb=f42a3c9bc60c403fa361df9dcd772be956c16ce4;p=friendica.git

diff --git a/include/update_gcontact.php b/include/update_gcontact.php
index ce2323f187..88e1817f0b 100644
--- a/include/update_gcontact.php
+++ b/include/update_gcontact.php
@@ -16,8 +16,8 @@ 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');
@@ -36,28 +36,29 @@ function update_gcontact_run(&$argv, &$argc){
 		return;
 	}
 
-	$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;
-		}
-	}
+	// Don't check this stuff if the function is called by the poller
+	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));
 
 	if (!$r)
 		return;
 
+	if (!in_array($r[0]["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS)))
+		return;
+
 	$data = probe_url($r[0]["url"]);
 
-	if (!in_array($data["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS)))
+	if (!in_array($data["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) {
+		if ($r[0]["server_url"] != "")
+			poco_check_server($r[0]["server_url"], $r[0]["network"]);
+
+		q("UPDATE `gcontact` SET `last_failure` = '%s' WHERE `id` = %d",
+			dbesc(datetime_convert()), intval($contact_id));
 		return;
+	}
 
 	if (($data["name"] == "") AND ($r[0]['name'] != ""))
 		$data["name"] = $r[0]['name'];