Merge remote-tracking branch 'upstream/develop' into 1604-cookie

[friendica.git] / include / update_gcontact.php

diff --git a/include/update_gcontact.php b/include/update_gcontact.php
index b5ea30a0a4d8803bedb8c0a80dc02ee3d977d283..88e1817f0b991ff6a0749c2d794b71510ab62b22 100644 (file)
--- a/include/update_gcontact.php
+++ b/include/update_gcontact.php
@@ -16,7 +16,6 @@ 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");
 
@@ -37,18 +36,10 @@ 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));