Merge pull request #2654 from annando/1607-thumb-micro

[friendica.git] / include / poller.php

diff --git a/include/poller.php b/include/poller.php
index 9e7080e64248d37fe5d7865b01f7fac59cbe0bd8..22fdbb5e5374a016a4ec61533727782a12ac6c26 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -27,14 +27,14 @@ function poller_run(&$argv, &$argc){
                unset($db_host, $db_user, $db_pass, $db_data);
        };
 
+       $max_processes = get_config('system', 'max_processes_backend');
+       if (intval($max_processes) == 0)
+               $max_processes = 5;
+
        $processlist = dbm::processlist();
        if ($processlist["list"] != "") {
                logger("Processcheck: Processes: ".$processlist["amount"]." - Processlist: ".$processlist["list"], LOGGER_DEBUG);
 
-               $max_processes = get_config('system', 'max_processes_backend');
-               if (intval($max_processes) == 0)
-                       $max_processes = 5;
-
                if ($processlist["amount"] > $max_processes) {
                        logger("Processcheck: Maximum number of processes for backend tasks (".$max_processes.") reached.", LOGGER_DEBUG);
                        return;
@@ -79,10 +79,6 @@ function poller_run(&$argv, &$argc){
                if ($processlist["amount"] != "") {
                        logger("Processcheck: Processes: ".$processlist["amount"]." - Processlist: ".$processlist["list"], LOGGER_DEBUG);
 
-                       $max_processes = get_config('system', 'max_processes_backend');
-                       if (intval($max_processes) == 0)
-                               $max_processes = 5;
-
                        if ($processlist["amount"] > $max_processes) {
                                logger("Processcheck: Maximum number of processes for backend tasks (".$max_processes.") reached.", LOGGER_DEBUG);
                                return;
@@ -232,7 +228,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 (!dba::is_result($r)) {
                // No processing here needed
                return;
        }