We now use the regular probing function

[friendica.git] / src / Core / Worker.php

diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index 633b8e12e93dec5ccdc10a1cf18b7fb69f2b0d21..9dd973728dcbfb6c8256883d538c624e62b50855 100644 (file)
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -5,7 +5,6 @@
 namespace Friendica\Core;
 
 use Friendica\Database\DBA;
-use Friendica\Database\DBM;
 use Friendica\Model\Process;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
@@ -163,7 +162,7 @@ class Worker
        {
                $condition = ["`executed` <= ? AND NOT `done`", NULL_DATE];
                $workerqueue = DBA::selectFirst('workerqueue', ['priority'], $condition, ['order' => ['priority']]);
-               if (DBM::is_result($workerqueue)) {
+               if (DBA::isResult($workerqueue)) {
                        return $workerqueue["priority"];
                } else {
                        return 0;
@@ -477,8 +476,8 @@ class Worker
 
                if ($max == 0) {
                        // the maximum number of possible user connections can be a system variable
-                       $r = DBA::fetch_first("SHOW VARIABLES WHERE `variable_name` = 'max_user_connections'");
-                       if (DBM::is_result($r)) {
+                       $r = DBA::fetchFirst("SHOW VARIABLES WHERE `variable_name` = 'max_user_connections'");
+                       if (DBA::isResult($r)) {
                                $max = $r["Value"];
                        }
                        // Or it can be granted. This overrides the system variable
@@ -498,7 +497,7 @@ class Worker
                // The processlist only shows entries of the current user
                if ($max != 0) {
                        $r = DBA::p('SHOW PROCESSLIST');
-                       $used = DBA::num_rows($r);
+                       $used = DBA::numRows($r);
                        DBA::close($r);
 
                        logger("Connection usage (user values): ".$used."/".$max, LOGGER_DEBUG);
@@ -513,16 +512,16 @@ class Worker
 
                // We will now check for the system values.
                // This limit could be reached although the user limits are fine.
-               $r = DBA::fetch_first("SHOW VARIABLES WHERE `variable_name` = 'max_connections'");
-               if (!DBM::is_result($r)) {
+               $r = DBA::fetchFirst("SHOW VARIABLES WHERE `variable_name` = 'max_connections'");
+               if (!DBA::isResult($r)) {
                        return false;
                }
                $max = intval($r["Value"]);
                if ($max == 0) {
                        return false;
                }
-               $r = DBA::fetch_first("SHOW STATUS WHERE `variable_name` = 'Threads_connected'");
-               if (!DBM::is_result($r)) {
+               $r = DBA::fetchFirst("SHOW STATUS WHERE `variable_name` = 'Threads_connected'");
+               if (!DBA::isResult($r)) {
                        return false;
                }
                $used = intval($r["Value"]);
@@ -735,7 +734,7 @@ class Worker
                );
 
                // No active processes at all? Fine
-               if (!DBM::is_result($r)) {
+               if (!DBA::isResult($r)) {
                        return false;
                }
                $priorities = [];
@@ -872,9 +871,9 @@ class Worker
 
                // There can already be jobs for us in the queue.
                $r = DBA::select('workerqueue', [], ['pid' => getmypid(), 'done' => false]);
-               if (DBM::is_result($r)) {
+               if (DBA::isResult($r)) {
                        self::$db_duration += (microtime(true) - $stamp);
-                       return DBA::inArray($r);
+                       return DBA::toArray($r);
                }
                DBA::close($r);
 
@@ -892,7 +891,7 @@ class Worker
 
                if ($found) {
                        $r = DBA::select('workerqueue', [], ['pid' => getmypid(), 'done' => false]);
-                       return DBA::inArray($r);
+                       return DBA::toArray($r);
                }
                return false;
        }
@@ -1010,13 +1009,11 @@ class Worker
         */
        public static function spawnWorker($do_cron = false)
        {
-               $args = ["bin/worker.php"];
+               $command = 'bin/worker.php';
 
-               if (!$do_cron) {
-                       $args[] = "no_cron";
-               }
+               $args = ['no_cron' => !$do_cron];
 
-               get_app()->proc_run($args);
+               get_app()->proc_run($command, $args);
 
                // after spawning we have to remove the flag.
                if (Config::get('system', 'worker_daemon_mode', false)) {
@@ -1166,7 +1163,7 @@ class Worker
                $row = DBA::selectFirst('worker-ipc', ['jobs'], ['key' => 1]);
 
                // When we don't have a row, no job is running
-               if (!DBM::is_result($row)) {
+               if (!DBA::isResult($row)) {
                        return false;
                }