Use a 10 minute timeout for high priority processes. This may be better.

[friendica.git] / include / cronhooks.php

diff --git a/include/cronhooks.php b/include/cronhooks.php
index 8c70008e453c913e9318184ed859e161ed68eb6a..4bb1e5f65960b3b3c1bbad1077d34628388040b0 100644 (file)
--- a/include/cronhooks.php
+++ b/include/cronhooks.php
@@ -19,21 +19,27 @@ function cronhooks_run(&$argv, &$argc){
 
        require_once('include/session.php');
        require_once('include/datetime.php');
-       require_once('include/pidfile.php');
 
        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.');
+       // Don't check this stuff if the function is called by the poller
+       if (App::callstack() != "poller_run") {
+               if (App::maxload_reached())
                        return;
-               }
+               if (App::is_already_running('cronhooks', 'include/cronhooks.php', 1140))
+                       return;
+       }
+
+       load_hooks();
+
+       if (($argc == 2) AND is_array($a->hooks) AND array_key_exists("cron", $a->hooks)) {
+                foreach ($a->hooks["cron"] as $hook)
+                       if ($hook[1] == $argv[1]) {
+                               logger("Calling cron hook '".$hook[1]."'", LOGGER_DEBUG);
+                               call_single_hook($a, $name, $hook, $data);
+                       }
+               return;
        }
 
        $last = get_config('system','last_cronhook');
@@ -50,30 +56,19 @@ 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();
-
        logger('cronhooks: start');
 
        $d = datetime_convert();
 
-       call_hooks('cron', $d);
+       if (get_config("system", "worker") AND is_array($a->hooks) AND array_key_exists("cron", $a->hooks)) {
+                foreach ($a->hooks["cron"] as $hook) {
+                       logger("Calling cronhooks for '".$hook[1]."'", LOGGER_DEBUG);
+                       proc_run(PRIORITY_MEDIUM, "include/cronhooks.php", $hook[1]);
+               }
+       } else
+               call_hooks('cron', $d);
 
        logger('cronhooks: end');