Don't create lock files if the process is called from the poller via the worker

[friendica.git] / include / cronhooks.php

diff --git a/include/cronhooks.php b/include/cronhooks.php
index 8c70008e453c913e9318184ed859e161ed68eb6a..71cb0fb7b2f44a72caad66ecde5eb29f84cbc6c2 100644 (file)
--- a/include/cronhooks.php
+++ b/include/cronhooks.php
@@ -24,15 +24,33 @@ function cronhooks_run(&$argv, &$argc){
        load_config('config');
        load_config('system');
 
-       $maxsysload = intval(get_config('system','maxloadavg'));
-       if($maxsysload < 1)
-               $maxsysload = 50;
-
-       $load = current_load();
-       if($load) {
-               if(intval($load) > $maxsysload) {
-                       logger('system: load ' . $load . ' too high. Cronhooks deferred to next scheduled run.');
-                       return;
+       // Don't check this stuff if the function is called by the poller
+       if (App::callstack() != "poller_run") {
+               $maxsysload = intval(get_config('system','maxloadavg'));
+               if($maxsysload < 1)
+                       $maxsysload = 50;
+
+               $load = current_load();
+               if($load) {
+                       if(intval($load) > $maxsysload) {
+                               logger('system: load ' . $load . ' too high. Cronhooks deferred to next scheduled run.');
+                               return;
+                       }
+               }
+
+               $lockpath = get_lockpath();
+               if ($lockpath != '') {
+                       $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,21 +68,6 @@ function cronhooks_run(&$argv, &$argc){
                }
        }
 
-       $lockpath = get_lockpath();
-       if ($lockpath != '') {
-               $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;
-               }
-       }
-
        $a->set_baseurl(get_config('system','url'));
 
        load_hooks();