Do a load check during execution of the queue.

[friendica.git] / include / poller.php

diff --git a/include/poller.php b/include/poller.php
index bdf6ba84e9991af67adc8ff6441cd7ae57f77659..c919b9d2abffff4ef069f5e8d3bc439c461ac004 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -26,10 +26,24 @@ function poller_run(&$argv, &$argc){
                unset($db_host, $db_user, $db_pass, $db_data);
        };
 
+       $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[0] . ' too high. poller deferred to next scheduled run.');
+                       return;
+               }
+       }
+
        if(($argc <= 1) OR ($argv[1] != "no_cron")) {
                // Run the cron job that calls all other jobs
                proc_run("php","include/cron.php");
 
+               // Run the cronhooks job separately from cron for being able to use a different timing
+               proc_run("php","include/cronhooks.php");
+
                // Cleaning dead processes
                $r = q("SELECT DISTINCT(`pid`) FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'");
                foreach($r AS $pid)
@@ -39,7 +53,7 @@ function poller_run(&$argv, &$argc){
 
        } else
                // Sleep two seconds before checking for running processes to avoid having too many workers
-               sleep(2);
+               sleep(4);
 
        // Checking number of workers
        $workers = q("SELECT COUNT(*) AS `workers` FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'");
@@ -53,6 +67,15 @@ function poller_run(&$argv, &$argc){
                return;
 
        while ($r = q("SELECT * FROM `workerqueue` WHERE `executed` = '0000-00-00 00:00:00' ORDER BY `created` LIMIT 1")) {
+
+               if(function_exists('sys_getloadavg')) {
+                       $load = sys_getloadavg();
+                       if(intval($load[0]) > $maxsysload) {
+                               logger('system: load ' . $load[0] . ' too high. poller deferred to next scheduled run.');
+                               return;
+                       }
+               }
+
                q("UPDATE `workerqueue` SET `executed` = '%s', `pid` = %d WHERE `id` = %d",
                        dbesc(datetime_convert()),
                        intval(getmypid()),
@@ -62,8 +85,16 @@ function poller_run(&$argv, &$argc){
 
                $argc = count($argv);
 
-               // To-Do: Check for existance
-               require_once(basename($argv[0]));
+               // Check for existance and validity of the include file
+               $include = $argv[0];
+
+               if (!validate_include($include)) {
+                       logger("Include file ".$argv[0]." is not valid!");
+                       q("DELETE FROM `workerqueue` WHERE `id` = %d", intval($r[0]["id"]));
+                       continue;
+               }
+
+               require_once($include);
 
                $funcname=str_replace(".php", "", basename($argv[0]))."_run";
 
@@ -74,7 +105,8 @@ function poller_run(&$argv, &$argc){
                        logger("Process ".getmypid().": ".$funcname." - done");
 
                        q("DELETE FROM `workerqueue` WHERE `id` = %d", intval($r[0]["id"]));
-               }
+               } else
+                       logger("Function ".$funcname." does not exist");
        }
 
 }