Merge pull request #5815 from annando/ap2

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

diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index f649e7773e3b8725129571b735996d974c62461a..3400f00ae1755229a24a20e16fc6844f1c7592c5 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;
@@ -118,12 +117,14 @@ class Worker
                                // Count active workers and compare them with a maximum value that depends on the load
                                if (self::tooMuchWorkers()) {
                                        logger('Active worker limit reached, quitting.', LOGGER_DEBUG);
+                                       Lock::release('worker');
                                        return;
                                }
 
                                // Check free memory
                                if ($a->min_memory_reached()) {
                                        logger('Memory limit reached, quitting.', LOGGER_DEBUG);
+                                       Lock::release('worker');
                                        return;
                                }
                                Lock::release('worker');
@@ -163,7 +164,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 +478,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 +499,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 +514,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"]);
@@ -577,7 +578,7 @@ class Worker
                                // How long is the process already running?
                                $duration = (time() - strtotime($entry["executed"])) / 60;
                                if ($duration > $max_duration) {
-                                       logger("Worker process ".$entry["pid"]." (".implode(" ", $argv).") took more than ".$max_duration." minutes. It will be killed now.");
+                                       logger("Worker process ".$entry["pid"]." (".substr(json_encode($argv), 0, 50).") took more than ".$max_duration." minutes. It will be killed now.");
                                        posix_kill($entry["pid"], SIGTERM);
 
                                        // We killed the stale process.
@@ -735,7 +736,7 @@ class Worker
                );
 
                // No active processes at all? Fine
-               if (!DBM::is_result($r)) {
+               if (!DBA::isResult($r)) {
                        return false;
                }
                $priorities = [];
@@ -872,9 +873,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 +893,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 +1011,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 +1165,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;
                }