Merge pull request #8075 from annando/html-escaping

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

diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index b451b11ca502b258dfed513be96afe774d7bd0f0..086934fb8b1d4002450fee0312db7f49dc25ae61 100644 (file)
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -48,15 +48,13 @@ class Worker
         */
        public static function processQueue($run_cron = true)
        {
-               $a = \get_app();
-
                // Ensure that all "strtotime" operations do run timezone independent
                date_default_timezone_set('UTC');
 
                self::$up_start = microtime(true);
 
                // At first check the maximum load. We shouldn't continue with a high load
-               if ($a->isMaxLoadReached()) {
+               if (DI::process()->isMaxLoadReached()) {
                        Logger::log('Pre check: maximum load reached, quitting.', Logger::DEBUG);
                        return;
                }
@@ -78,7 +76,7 @@ class Worker
                }
 
                // Do we have too few memory?
-               if ($a->isMinMemoryReached()) {
+               if (DI::process()->isMinMemoryReached()) {
                        Logger::log('Pre check: Memory limit reached, quitting.', Logger::DEBUG);
                        return;
                }
@@ -90,7 +88,7 @@ class Worker
                }
 
                // Possibly there are too much database processes that block the system
-               if ($a->isMaxProcessesReached()) {
+               if (DI::process()->isMaxProcessesReached()) {
                        Logger::log('Pre check: maximum processes reached, quitting.', Logger::DEBUG);
                        return;
                }
@@ -117,9 +115,9 @@ class Worker
                                }
 
                                // Trying to fetch new processes - but only once when successful
-                               if (!$refetched && Lock::acquire('worker_process', 0)) {
+                               if (!$refetched && DI::lock()->acquire('worker_process', 0)) {
                                        self::findWorkerProcesses();
-                                       Lock::release('worker_process');
+                                       DI::lock()->release('worker_process');
                                        self::$state = self::STATE_REFETCH;
                                        $refetched = true;
                                } else {
@@ -131,21 +129,21 @@ class Worker
                        if (!self::getWaitingJobForPID()) {
                                self::$state = self::STATE_LONG_LOOP;
 
-                               if (Lock::acquire('worker', 0)) {
+                               if (DI::lock()->acquire('worker', 0)) {
                                // Count active workers and compare them with a maximum value that depends on the load
                                        if (self::tooMuchWorkers()) {
                                                Logger::log('Active worker limit reached, quitting.', Logger::DEBUG);
-                                               Lock::release('worker');
+                                               DI::lock()->release('worker');
                                                return;
                                        }
 
                                        // Check free memory
-                                       if ($a->isMinMemoryReached()) {
+                                       if (DI::process()->isMinMemoryReached()) {
                                                Logger::log('Memory limit reached, quitting.', Logger::DEBUG);
-                                               Lock::release('worker');
+                                               DI::lock()->release('worker');
                                                return;
                                        }
-                                       Lock::release('worker');
+                                       DI::lock()->release('worker');
                                }
                        }
 
@@ -251,8 +249,6 @@ class Worker
         */
        public static function execute($queue)
        {
-               $a = \get_app();
-
                $mypid = getmypid();
 
                // Quit when in maintenance
@@ -262,7 +258,7 @@ class Worker
                }
 
                // Constantly check the number of parallel database processes
-               if ($a->isMaxProcessesReached()) {
+               if (DI::process()->isMaxProcessesReached()) {
                        Logger::log("Max processes reached for process ".$mypid, Logger::DEBUG);
                        return false;
                }
@@ -374,7 +370,7 @@ class Worker
         */
        private static function execFunction($queue, $funcname, $argv, $method_call)
        {
-               $a = \get_app();
+               $a = DI::app();
 
                $argc = count($argv);
 
@@ -386,7 +382,7 @@ class Worker
 
                // We use the callstack here to analyze the performance of executed worker entries.
                // For this reason the variables have to be initialized.
-               $a->getProfiler()->reset();
+               DI::profiler()->reset();
 
                $a->queue = $queue;
 
@@ -443,7 +439,7 @@ class Worker
 
                Logger::info('Process done.', ['priority' => $queue["priority"], 'id' => $queue["id"], 'duration' => round($duration, 3)]);
 
-               $a->getProfiler()->saveLog($a->getLogger(), "ID " . $queue["id"] . ": " . $funcname);
+               DI::profiler()->saveLog(DI::logger(), "ID " . $queue["id"] . ": " . $funcname);
 
                $cooldown = Config::get("system", "worker_cooldown", 0);
 
@@ -937,14 +933,14 @@ class Worker
                }
 
                $stamp = (float)microtime(true);
-               if (!Lock::acquire('worker_process')) {
+               if (!DI::lock()->acquire('worker_process')) {
                        return false;
                }
                self::$lock_duration += (microtime(true) - $stamp);
 
                $found = self::findWorkerProcesses();
 
-               Lock::release('worker_process');
+               DI::lock()->release('worker_process');
 
                if ($found) {
                        $stamp = (float)microtime(true);
@@ -981,7 +977,7 @@ class Worker
                        return;
                }
 
-               $url = System::baseUrl()."/worker";
+               $url = DI::baseUrl() . '/worker';
                Network::fetchUrl($url, false, 1);
        }
 
@@ -1085,8 +1081,8 @@ class Worker
 
                $args = ['no_cron' => !$do_cron];
 
-               $a = get_app();
-               $process = new Core\Process($a->getLogger(), $a->getMode(), $a->getConfig(), $a->getBasePath());
+               $a = DI::app();
+               $process = new Core\Process(DI::logger(), DI::mode(), DI::config(), $a->getBasePath());
                $process->run($command, $args);
 
                // after spawning we have to remove the flag.
@@ -1129,7 +1125,7 @@ class Worker
 
                $priority = PRIORITY_MEDIUM;
                // Don't fork from frontend tasks by default
-               $dont_fork = Config::get("system", "worker_dont_fork", false) || !\get_app()->getMode()->isBackend();
+               $dont_fork = Config::get("system", "worker_dont_fork", false) || !DI::mode()->isBackend();
                $created = DateTimeFormat::utcNow();
                $force_priority = false;
 
@@ -1176,13 +1172,13 @@ class Worker
                }
 
                // If there is a lock then we don't have to check for too much worker
-               if (!Lock::acquire('worker', 0)) {
+               if (!DI::lock()->acquire('worker', 0)) {
                        return $added;
                }
 
                // If there are already enough workers running, don't fork another one
                $quit = self::tooMuchWorkers();
-               Lock::release('worker');
+               DI::lock()->release('worker');
 
                if ($quit) {
                        return $added;