Automatically refresh after two minutes when system is overloaded

[friendica.git] / include / cronhooks.php

diff --git a/include/cronhooks.php b/include/cronhooks.php
index 031011ac365bd9cd604ff1193cd5d3dc8795a92e..b6cf0e72378763d6b3e5ac697672dce67438ea02 100644 (file)
--- a/include/cronhooks.php
+++ b/include/cronhooks.php
@@ -11,42 +11,37 @@ function cronhooks_run(&$argv, &$argc){
        }
 
        if(is_null($db)) {
-           @include(".htconfig.php");
-       require_once("include/dba.php");
-           $db = new dba($db_host, $db_user, $db_pass, $db_data);
-       unset($db_host, $db_user, $db_pass, $db_data);
-       };
+               @include(".htconfig.php");
+               require_once("include/dba.php");
+               $db = new dba($db_host, $db_user, $db_pass, $db_data);
+               unset($db_host, $db_user, $db_pass, $db_data);
+       };
 
        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;
-       if(function_exists('sys_getloadavg')) {
-               $load = sys_getloadavg();
-               if(intval($load[0]) > $maxsysload) {
-                       logger('system: load ' . $load . ' too high. Poller 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;
-               }
        }
 
-       $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) {
-                                $pidfile->kill();
-                                logger("cronhooks: killed stale process");
-                               // Calling a new instance
-                               proc_run('php','include/cronhooks.php');
-                        }
-                       exit;
+       $last = get_config('system','last_cronhook');
+
+       $poll_interval = intval(get_config('system','cronhook_interval'));
+       if(! $poll_interval)
+               $poll_interval = 9;
+
+       if($last) {
+               $next = $last + ($poll_interval * 60);
+               if($next > time()) {
+                       logger('cronhook intervall not reached');
+                       return;
                }
        }
 
@@ -62,10 +57,12 @@ function cronhooks_run(&$argv, &$argc){
 
        logger('cronhooks: end');
 
+       set_config('system','last_cronhook', time());
+
        return;
 }
 
 if (array_search(__file__,get_included_files())===0){
-  cronhooks_run($argv,$argc);
-  killme();
+       cronhooks_run($_SERVER["argv"],$_SERVER["argc"]);
+       killme();
 }