it should work now

[friendica.git] / include / poller.php

diff --git a/include/poller.php b/include/poller.php
index 2f9e72611029fe9bb8ffa90bc488d468820594e0..5560b3340e6209fc4ab82c97ecd3619bc9840afc 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -17,11 +17,11 @@ require_once("boot.php");
 function poller_run($argv, $argc){
        global $a, $db;
 
-       if (is_null($a)) {
+       if(is_null($a)) {
                $a = new App;
        }
 
-       if (is_null($db)) {
+       if(is_null($db)) {
                @include(".htconfig.php");
                require_once("include/dba.php");
                $db = new dba($db_host, $db_user, $db_pass, $db_data);
@@ -49,7 +49,7 @@ function poller_run($argv, $argc){
                return;
        }
 
-       if (($argc <= 1) OR ($argv[1] != "no_cron")) {
+       if(($argc <= 1) OR ($argv[1] != "no_cron")) {
                poller_run_cron();
        }
 
@@ -357,17 +357,17 @@ function poller_max_connections_reached() {
  *
  */
 function poller_kill_stale_workers() {
-       $r = q("SELECT `pid`, `executed`, `priority`, `parameter` FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'");
+       $r = q("SELECT `pid`, `executed`, `priority`, `parameter` FROM `workerqueue` WHERE `executed` > '%s'", dbesc(NULL_DATE));
 
        if (!dbm::is_result($r)) {
                // No processing here needed
                return;
        }
 
-       foreach ($r AS $pid)
+       foreach ($r AS $pid) {
                if (!posix_kill($pid["pid"], 0)) {
-                       q("UPDATE `workerqueue` SET `executed` = '0000-00-00 00:00:00', `pid` = 0 WHERE `pid` = %d",
-                               intval($pid["pid"]));
+                       q("UPDATE `workerqueue` SET `executed` = '%s', `pid` = 0 WHERE `pid` = %d",
+                               dbesc(NULL_DATE), intval($pid["pid"]));
                } else {
                        // Kill long running processes
 
@@ -391,8 +391,9 @@ function poller_kill_stale_workers() {
                                // We killed the stale process.
                                // To avoid a blocking situation we reschedule the process at the beginning of the queue.
                                // Additionally we are lowering the priority.
-                               q("UPDATE `workerqueue` SET `executed` = '0000-00-00 00:00:00', `created` = '%s',
+                               q("UPDATE `workerqueue` SET `executed` = '%s', `created` = '%s',
                                                        `priority` = %d, `pid` = 0 WHERE `pid` = %d",
+                                       dbesc(NULL_DATE),
                                        dbesc(datetime_convert()),
                                        intval(PRIORITY_NEGLIGIBLE),
                                        intval($pid["pid"]));
@@ -400,6 +401,7 @@ function poller_kill_stale_workers() {
                                logger("Worker process ".$pid["pid"]." (".implode(" ", $argv).") now runs for ".round($duration)." of ".$max_duration." allowed minutes. That's okay.", LOGGER_DEBUG);
                        }
                }
+       }
 }
 
 /**
@@ -416,7 +418,7 @@ function poller_too_much_workers() {
 
        // Decrease the number of workers at higher load
        $load = current_load();
-       if ($load) {
+       if($load) {
                $maxsysload = intval(Config::get("system", "maxloadavg", 50));
 
                $maxworkers = $queues;
@@ -426,15 +428,15 @@ function poller_too_much_workers() {
                $slope = $maxworkers / pow($maxsysload, $exponent);
                $queues = ceil($slope * pow(max(0, $maxsysload - $load), $exponent));
 
-               $s = q("SELECT COUNT(*) AS `total` FROM `workerqueue` WHERE `executed` = '0000-00-00 00:00:00'");
+               $s = q("SELECT COUNT(*) AS `total` FROM `workerqueue` WHERE `executed` <= '%s'", dbesc(NULL_DATE));
                $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");
+                       $s = q("SELECT `priority` FROM `workerqueue` WHERE `executed` <= '%s' ORDER BY `priority` LIMIT 1", dbesc(NULL_DATE));
                        $top_priority = $s[0]["priority"];
 
-                       $s = q("SELECT `id` FROM `workerqueue` WHERE `priority` <= %d AND `executed` != '0000-00-00 00:00:00' LIMIT 1",
-                               intval($top_priority));
+                       $s = q("SELECT `id` FROM `workerqueue` WHERE `priority` <= %d AND `executed` > '%s' LIMIT 1",
+                               intval($top_priority), dbesc(NULL_DATE));
                        $high_running = dbm::is_result($s);
 
                        if (!$high_running AND ($top_priority > PRIORITY_UNDEFINED) AND ($top_priority < PRIORITY_NEGLIGIBLE)) {
@@ -554,21 +556,25 @@ function poller_worker_process() {
        if (poller_passing_slow($highest_priority)) {
                // Are there waiting processes with a higher priority than the currently highest?
                $r = q("SELECT * FROM `workerqueue`
-                               WHERE `executed` = '0000-00-00 00:00:00' AND `priority` < %d
-                               ORDER BY `priority`, `created` LIMIT 1", dbesc($highest_priority));
-               if (dbm::is_result($r))
+                               WHERE `executed` <= '%s' AND `priority` < %d
+                               ORDER BY `priority`, `created` LIMIT 1",
+                               dbesc(NULL_DATE),
+                               intval($highest_priority));
+               if (dbm::is_result($r)) {
                        return $r;
-
+               }
                // Give slower processes some processing time
                $r = q("SELECT * FROM `workerqueue`
-                               WHERE `executed` = '0000-00-00 00:00:00' AND `priority` > %d
-                               ORDER BY `priority`, `created` LIMIT 1", dbesc($highest_priority));
+                               WHERE `executed` <= '%s' AND `priority` > %d
+                               ORDER BY `priority`, `created` LIMIT 1",
+                               dbesc(NULL_DATE),
+                               intval($highest_priority));
        }
 
        // If there is no result (or we shouldn't pass lower processes) we check without priority limit
-       if (($highest_priority == 0) OR !dbm::is_result($r))
-               $r = q("SELECT * FROM `workerqueue` WHERE `executed` = '0000-00-00 00:00:00' ORDER BY `priority`, `created` LIMIT 1");
-
+       if (($highest_priority == 0) OR !dbm::is_result($r)) {
+               $r = q("SELECT * FROM `workerqueue` WHERE `executed` <= '%s' ORDER BY `priority`, `created` LIMIT 1", dbesc(NULL_DATE));
+       }
        return $r;
 }