Merge branch 'release-3.4' into develop

[friendica.git] / include / cronhooks.php

diff --git a/include/cronhooks.php b/include/cronhooks.php
index cf1d13765faf56d8d55b49bc5d6796cc677ede02..3a09da48ceb3a16dba777731ea2e3e72efb058ea 100644 (file)
--- a/include/cronhooks.php
+++ b/include/cronhooks.php
@@ -35,11 +35,17 @@ function cronhooks_run(&$argv, &$argc){
                }
        }
 
-       $lockpath = get_config('system','lockpath');
+       $lockpath = get_lockpath();
        if ($lockpath != '') {
-               $pidfile = new pidfile($lockpath, 'cron.lck');
+               $pidfile = new pidfile($lockpath, 'cronhooks');
                if($pidfile->is_already_running()) {
                        logger("cronhooks: Already running");
+                       if ($pidfile->running_time() > 19*60) {
+                                $pidfile->kill();
+                                logger("cronhooks: killed stale process");
+                               // Calling a new instance
+                               proc_run('php','include/cronhooks.php');
+                        }
                        exit;
                }
        }
@@ -50,15 +56,16 @@ function cronhooks_run(&$argv, &$argc){
 
        logger('cronhooks: start');
 
-
        $d = datetime_convert();
 
        call_hooks('cron', $d);
 
+       logger('cronhooks: end');
+
        return;
 }
 
 if (array_search(__file__,get_included_files())===0){
-  cronhooks_run($argv,$argc);
+  cronhooks_run($_SERVER["argv"],$_SERVER["argc"]);
   killme();
 }