Merge pull request #2685 from annando/1607-poller-information

[friendica.git] / include / onepoll.php

diff --git a/include/onepoll.php b/include/onepoll.php
index 8b91070dcce453137d752c92c695a0acdcc7dfbc..eb1045de142957dcab4e08d8b66ff8aa3ecb4750 100644 (file)
--- a/include/onepoll.php
+++ b/include/onepoll.php
@@ -31,7 +31,6 @@ function onepoll_run(&$argv, &$argc){
        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');
@@ -61,20 +60,9 @@ function onepoll_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, '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;
-                       }
-               }
-       }
+       if (App::callstack() != "poller_run")
+               if (App::is_already_running('onepoll'.$contact_id, '', 540))
+                       return;
 
        $d = datetime_convert();