API: use regex instead of SimpleXMLElement

[friendica.git] / include / poller.php

diff --git a/include/poller.php b/include/poller.php
index 3a28b177c343e152c55f2f671d888fccfcb2003a..d134f30d0fac270001d5cac8d9e98bc1411d81d7 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -26,6 +26,9 @@ function poller_run(&$argv, &$argc){
                unset($db_host, $db_user, $db_pass, $db_data);
        };
 
+       if ($a->max_processes_reached())
+               return;
+
        if (poller_max_connections_reached())
                return;
 
@@ -59,6 +62,10 @@ function poller_run(&$argv, &$argc){
 
        while ($r = q("SELECT * FROM `workerqueue` WHERE `executed` = '0000-00-00 00:00:00' ORDER BY `created` LIMIT 1")) {
 
+               // Constantly check the number of parallel database processes
+               if ($a->max_processes_reached())
+                       return;
+
                // Constantly check the number of available database connections to let the frontend be accessible at any time
                if (poller_max_connections_reached())
                        return;
@@ -202,7 +209,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;
        }