Fix Issue #2816 - MySQL version typo

[friendica.git] / include / poller.php

diff --git a/include/poller.php b/include/poller.php
index 0835528717cbe81ab56b26d599e410a6f5a4756b..fe4d4245af8df0a3a3d6fc4c6f94accbe2c5e7b5 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -29,6 +29,14 @@ function poller_run(&$argv, &$argc){
                unset($db_host, $db_user, $db_pass, $db_data);
        };
 
+       // Quit when in maintenance
+       if (get_config('system', 'maintenance', true))
+               return;
+
+       $a->start_process();
+
+       $mypid = getmypid();
+
        if ($a->max_processes_reached())
                return;
 
@@ -67,6 +75,10 @@ function poller_run(&$argv, &$argc){
 
        while ($r = q("SELECT * FROM `workerqueue` WHERE `executed` = '0000-00-00 00:00:00' ORDER BY `priority`, `created` LIMIT 1")) {
 
+               // Quit when in maintenance
+               if (get_config('system', 'maintenance', true))
+                       return;
+
                // Constantly check the number of parallel database processes
                if ($a->max_processes_reached())
                        return;
@@ -81,15 +93,19 @@ function poller_run(&$argv, &$argc){
 
                q("UPDATE `workerqueue` SET `executed` = '%s', `pid` = %d WHERE `id` = %d AND `executed` = '0000-00-00 00:00:00'",
                        dbesc(datetime_convert()),
-                       intval(getmypid()),
+                       intval($mypid),
                        intval($r[0]["id"]));
 
                // Assure that there are no tasks executed twice
-               $id = q("SELECT `id` FROM `workerqueue` WHERE `id` = %d AND `pid` = %d",
-                       intval($r[0]["id"]),
-                       intval(getmypid()));
+               $id = q("SELECT `pid`, `executed` FROM `workerqueue` WHERE `id` = %d", intval($r[0]["id"]));
                if (!$id) {
-                       logger("Queue item ".$r[0]["id"]." was executed multiple times - skip this execution", LOGGER_DEBUG);
+                       logger("Queue item ".$r[0]["id"]." vanished - skip this execution", LOGGER_DEBUG);
+                       continue;
+               } elseif ((strtotime($id[0]["executed"]) <= 0) OR ($id[0]["pid"] == 0)) {
+                       logger("Entry for queue item ".$r[0]["id"]." wasn't stored - we better stop here", LOGGER_DEBUG);
+                       return;
+               } elseif ($id[0]["pid"] != $mypid) {
+                       logger("Queue item ".$r[0]["id"]." is to be executed by process ".$id[0]["pid"]." and not by me (".$mypid.") - skip this execution", LOGGER_DEBUG);
                        continue;
                }
 
@@ -111,15 +127,15 @@ function poller_run(&$argv, &$argc){
                $funcname = str_replace(".php", "", basename($argv[0]))."_run";
 
                if (function_exists($funcname)) {
-                       logger("Process ".getmypid()." - Prio ".$r[0]["priority"]." - ID ".$r[0]["id"].": ".$funcname." ".$r[0]["parameter"]);
+                       logger("Process ".$mypid." - Prio ".$r[0]["priority"]." - ID ".$r[0]["id"].": ".$funcname." ".$r[0]["parameter"]);
                        $funcname($argv, $argc);
 
                        if ($cooldown > 0) {
-                               logger("Process ".getmypid()." - Prio ".$r[0]["priority"]." - ID ".$r[0]["id"].": ".$funcname." - in cooldown for ".$cooldown." seconds");
+                               logger("Process ".$mypid." - 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");
+                       logger("Process ".$mypid." - Prio ".$r[0]["priority"]." - ID ".$r[0]["id"].": ".$funcname." - done");
 
                        q("DELETE FROM `workerqueue` WHERE `id` = %d", intval($r[0]["id"]));
                } else
@@ -319,13 +335,16 @@ function poller_too_much_workers() {
 }
 
 function poller_active_workers() {
-       $workers = q("SELECT COUNT(*) AS `workers` FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'");
+       $workers = q("SELECT COUNT(*) AS `processes` FROM `process` WHERE `command` = 'poller.php'");
 
-       return($workers[0]["workers"]);
+       return($workers[0]["processes"]);
 }
 
 if (array_search(__file__,get_included_files())===0){
-  poller_run($_SERVER["argv"],$_SERVER["argc"]);
-  killme();
+       poller_run($_SERVER["argv"],$_SERVER["argc"]);
+
+       get_app()->end_process();
+
+       killme();
 }
 ?>