regenerated master messages.po for new strings in the admin panel

[friendica.git] / include / poller.php

diff --git a/include/poller.php b/include/poller.php
index 2eca03ef98e346b9aa238a09ca13ef24f44b9015..dfc3b90cf08c4249df88095cfc65b67663e2ca4f 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -10,6 +10,9 @@ if (!file_exists("boot.php") AND (sizeof($_SERVER["argv"]) != 0)) {
        chdir($directory);
 }
 
+use \Friendica\Core\Config;
+use \Friendica\Core\PConfig;
+
 require_once("boot.php");
 
 function poller_run(&$argv, &$argc){
@@ -36,17 +39,17 @@ function poller_run(&$argv, &$argc){
                return;
 
        // Checking the number of workers
-       if (poller_too_much_workers(1)) {
+       if (poller_too_much_workers()) {
                poller_kill_stale_workers();
                return;
        }
 
        if(($argc <= 1) OR ($argv[1] != "no_cron")) {
                // Run the cron job that calls all other jobs
-               proc_run("php","include/cron.php");
+               proc_run(PRIORITY_MEDIUM, "include/cron.php");
 
                // Run the cronhooks job separately from cron for being able to use a different timing
-               proc_run("php","include/cronhooks.php");
+               proc_run(PRIORITY_MEDIUM, "include/cronhooks.php");
 
                // Cleaning dead processes
                poller_kill_stale_workers();
@@ -55,12 +58,14 @@ function poller_run(&$argv, &$argc){
                sleep(4);
 
        // Checking number of workers
-       if (poller_too_much_workers(2))
+       if (poller_too_much_workers())
                return;
 
+       $cooldown = Config::get("system", "worker_cooldown", 0);
+
        $starttime = time();
 
-       while ($r = q("SELECT * FROM `workerqueue` WHERE `executed` = '0000-00-00 00:00:00' ORDER BY `created` LIMIT 1")) {
+       while ($r = q("SELECT * FROM `workerqueue` WHERE `executed` = '0000-00-00 00:00:00' ORDER BY `priority`, `created` LIMIT 1")) {
 
                // Constantly check the number of parallel database processes
                if ($a->max_processes_reached())
@@ -71,7 +76,7 @@ function poller_run(&$argv, &$argc){
                        return;
 
                // Count active workers and compare them with a maximum value that depends on the load
-               if (poller_too_much_workers(3))
+               if (poller_too_much_workers())
                        return;
 
                q("UPDATE `workerqueue` SET `executed` = '%s', `pid` = %d WHERE `id` = %d AND `executed` = '0000-00-00 00:00:00'",
@@ -103,13 +108,18 @@ function poller_run(&$argv, &$argc){
 
                require_once($include);
 
-               $funcname=str_replace(".php", "", basename($argv[0]))."_run";
+               $funcname = str_replace(".php", "", basename($argv[0]))."_run";
 
                if (function_exists($funcname)) {
-                       logger("Process ".getmypid()." - ID ".$r[0]["id"].": ".$funcname." ".$r[0]["parameter"]);
+                       logger("Process ".getmypid()." - Prio ".$r[0]["priority"]." - ID ".$r[0]["id"].": ".$funcname." ".$r[0]["parameter"]);
                        $funcname($argv, $argc);
 
-                       logger("Process ".getmypid()." - ID ".$r[0]["id"].": ".$funcname." - done");
+                       if ($cooldown > 0) {
+                               logger("Process ".getmypid()." - Prio ".$r[0]["priority"]." - ID ".$r[0]["id"].": ".$funcname." - in cooldown for ".$cooldown." seconds");
+                               sleep($cooldown);
+                       }
+
+                       logger("Process ".getmypid()." - Prio ".$r[0]["priority"]." - ID ".$r[0]["id"].": ".$funcname." - done");
 
                        q("DELETE FROM `workerqueue` WHERE `id` = %d", intval($r[0]["id"]));
                } else
@@ -209,7 +219,7 @@ function poller_max_connections_reached() {
 function poller_kill_stale_workers() {
        $r = q("SELECT `pid`, `executed` FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'");
 
-       if (!is_array($r) || count($r) == 0) {
+       if (!dbm::is_result($r)) {
                // No processing here needed
                return;
        }
@@ -234,13 +244,16 @@ function poller_kill_stale_workers() {
                }
 }
 
-function poller_too_much_workers($stage) {
+function poller_too_much_workers() {
+
 
        $queues = get_config("system", "worker_queues");
 
        if ($queues == 0)
                $queues = 4;
 
+       $maxqueues = $queues;
+
        $active = poller_active_workers();
 
        // Decrease the number of workers at higher load
@@ -257,8 +270,33 @@ function poller_too_much_workers($stage) {
                $slope = $maxworkers / pow($maxsysload, $exponent);
                $queues = ceil($slope * pow(max(0, $maxsysload - $load), $exponent));
 
-               logger("Current load stage ".$stage.": ".$load." - maximum: ".$maxsysload." - current queues: ".$active." - maximum: ".$queues, LOGGER_DEBUG);
+               $s = q("SELECT COUNT(*) AS `total` FROM `workerqueue` WHERE `executed` = '0000-00-00 00:00:00'");
+               $entries = $s[0]["total"];
+
+               if (Config::get("system", "worker_fastlane", false) AND ($queues > 0) AND ($entries > 0) AND ($active >= $queues)) {
+                       $s = q("SELECT `priority` FROM `workerqueue` WHERE `executed` = '0000-00-00 00:00:00' ORDER BY `priority` LIMIT 1");
+                       $top_priority = $s[0]["priority"];
 
+                       $s = q("SELECT COUNT(*) AS `total` FROM `workerqueue` WHERE `priority` <= %d AND `executed` != '0000-00-00 00:00:00'",
+                               intval($top_priority));
+                       $high_running = $s[0]["total"];
+
+                       /// @todo define maximum number of fastlanes
+                       if (($high_running == 0) AND ($top_priority >= PRIORITY_HIGH) AND ($top_priority < PRIORITY_LOW)) {
+                               logger("There are jobs with priority ".$top_priority." waiting but none is executed. Open a fastlane.", LOGGER_DEBUG);
+                               $queues = $active + 1;
+                       }
+               }
+
+               logger("Current load: ".$load." - maximum: ".$maxsysload." - current queues: ".$active."/".$entries." - maximum: ".$queues."/".$maxqueues, LOGGER_DEBUG);
+
+               // Are there fewer workers running as possible? Then fork a new one.
+               if (!get_config("system", "worker_dont_fork") AND ($queues > ($active + 1)) AND ($entries > 1)) {
+                       logger("Active workers: ".$active."/".$queues." Fork a new worker.", LOGGER_DEBUG);
+                       $args = array("php", "include/poller.php", "no_cron");
+                       $a = get_app();
+                       $a->proc_run($args);
+               }
        }
 
        return($active >= $queues);