Merge branch 'release-3.4' into develop

[friendica.git] / include / cronhooks.php

diff --git a/include/cronhooks.php b/include/cronhooks.php
index 0ba453555ce63c580622d922ed3feee27438e329..3a09da48ceb3a16dba777731ea2e3e72efb058ea 100644 (file)
--- a/include/cronhooks.php
+++ b/include/cronhooks.php
@@ -35,12 +35,12 @@ function cronhooks_run(&$argv, &$argc){
                }
        }
 
-       $lockpath = get_config('system','lockpath');
+       $lockpath = get_lockpath();
        if ($lockpath != '') {
                $pidfile = new pidfile($lockpath, 'cronhooks');
                if($pidfile->is_already_running()) {
                        logger("cronhooks: Already running");
-                       if ($pidfile->running_time() > 9*60) {
+                       if ($pidfile->running_time() > 19*60) {
                                 $pidfile->kill();
                                 logger("cronhooks: killed stale process");
                                // Calling a new instance
@@ -66,6 +66,6 @@ function cronhooks_run(&$argv, &$argc){
 }
 
 if (array_search(__file__,get_included_files())===0){
-  cronhooks_run($argv,$argc);
+  cronhooks_run($_SERVER["argv"],$_SERVER["argc"]);
   killme();
 }