Add tests for Network\Probe::getFeedLink

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

diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index da38cba10a116fd639375312e7a06a5774c64010..24febf3bc4cc74ae47e603e21a4eeb53f2b01dbf 100644 (file)
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -1,7 +1,24 @@
 <?php
 /**
- * @file src/Core/Worker.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
+
 namespace Friendica\Core;
 
 use Friendica\Core;
@@ -12,14 +29,8 @@ use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 
 /**
- * @file src/Core/Worker.php
- *
  * Contains the class for the worker background job processing
  */
-
-/**
- * Worker methods
- */
 class Worker
 {
        const STATE_STARTUP    = 1; // Worker is in startup. This takes most time.
@@ -65,7 +76,7 @@ class Worker
                // Kill stale processes every 5 minutes
                $last_cleanup = DI::config()->get('system', 'worker_last_cleaned', 0);
                if (time() > ($last_cleanup + 300)) {
-                       Config::set('system', 'worker_last_cleaned', time());
+                       DI::config()->set('system', 'worker_last_cleaned', time());
                        self::killStaleWorkers();
                }
 
@@ -297,7 +308,7 @@ class Worker
                        $stamp = (float)microtime(true);
                        $condition = ["`id` = ? AND `next_try` < ?", $queue['id'], DateTimeFormat::utcNow()];
                        if (DBA::update('workerqueue', ['done' => true], $condition)) {
-                               Config::set('system', 'last_worker_execution', DateTimeFormat::utcNow());
+                               DI::config()->set('system', 'last_worker_execution', DateTimeFormat::utcNow());
                        }
                        self::$db_duration = (microtime(true) - $stamp);
                        self::$db_duration_write += (microtime(true) - $stamp);
@@ -343,7 +354,7 @@ class Worker
 
                        $stamp = (float)microtime(true);
                        if (DBA::update('workerqueue', ['done' => true], ['id' => $queue["id"]])) {
-                               Config::set('system', 'last_worker_execution', DateTimeFormat::utcNow());
+                               DI::config()->set('system', 'last_worker_execution', DateTimeFormat::utcNow());
                        }
                        self::$db_duration = (microtime(true) - $stamp);
                        self::$db_duration_write += (microtime(true) - $stamp);
@@ -603,6 +614,7 @@ class Worker
                                }
                        }
                }
+               DBA::close($entries);
        }
 
        /**
@@ -673,7 +685,7 @@ class Worker
                                self::$db_duration_stat += (microtime(true) - $stamp);
                                while ($entry = DBA::fetch($jobs)) {
                                        $stamp = (float)microtime(true);
-                                       $processes = DBA::p("SELECT COUNT(*) AS `running` FROM `process` INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid` WHERE NOT `done` AND `priority` = ?", $entry["priority"]);
+                                       $processes = DBA::p("SELECT COUNT(*) AS `running` FROM `workerqueue-view` WHERE `priority` = ?", $entry["priority"]);
                                        self::$db_duration += (microtime(true) - $stamp);
                                        self::$db_duration_stat += (microtime(true) - $stamp);
                                        if ($process = DBA::fetch($processes)) {
@@ -687,7 +699,7 @@ class Worker
                        } else {
                                $waiting_processes =  self::totalEntries();
                                $stamp = (float)microtime(true);
-                               $jobs = DBA::p("SELECT COUNT(*) AS `running`, `priority` FROM `process` INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid` AND NOT `done` GROUP BY `priority` ORDER BY `priority`");
+                               $jobs = DBA::p("SELECT COUNT(*) AS `running`, `priority` FROM `workerqueue-view` GROUP BY `priority` ORDER BY `priority`");
                                self::$db_duration += (microtime(true) - $stamp);
                                self::$db_duration_stat += (microtime(true) - $stamp);
 
@@ -828,9 +840,7 @@ class Worker
                $running = [];
                $running_total = 0;
                $stamp = (float)microtime(true);
-               $processes = DBA::p("SELECT COUNT(DISTINCT(`process`.`pid`)) AS `running`, `priority` FROM `process`
-                       INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid`
-                       WHERE NOT `done` GROUP BY `priority`");
+               $processes = DBA::p("SELECT COUNT(DISTINCT(`pid`)) AS `running`, `priority` FROM `workerqueue-view` GROUP BY `priority`");
                self::$db_duration += (microtime(true) - $stamp);
                while ($process = DBA::fetch($processes)) {
                        $running[$process['priority']] = $process['running'];
@@ -1004,7 +1014,7 @@ class Worker
                                return;
                        }
 
-                       Config::set("system", "worker_started", time());
+                       DI::config()->set("system", "worker_started", time());
 
                        // Do we have enough running workers? Then we quit here.
                        if (self::tooMuchWorkers()) {