Merge branch 'develop' into rewrite/gravity-constants

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

diff --git a/src/Core/Worker/Cron.php b/src/Core/Worker/Cron.php
index 8df88e9e293c0db8b1c6342429c502388324203d..11631e02b341e4594bd6774d1919c446aa4914d0 100644 (file)
--- a/src/Core/Worker/Cron.php
+++ b/src/Core/Worker/Cron.php
@@ -47,10 +47,10 @@ class Cron
                Logger::info('Add cron entries');
 
                // Check for spooled items
-               Worker::add(['priority' => PRIORITY_HIGH, 'force_priority' => true], 'SpoolPost');
+               Worker::add(['priority' => Worker::PRIORITY_HIGH, 'force_priority' => true], 'SpoolPost');
 
                // Run the cron job that calls all other jobs
-               Worker::add(['priority' => PRIORITY_MEDIUM, 'force_priority' => true], 'Cron');
+               Worker::add(['priority' => Worker::PRIORITY_MEDIUM, 'force_priority' => true], 'Cron');
 
                // Cleaning dead processes
                self::killStaleWorkers();
@@ -77,6 +77,8 @@ class Cron
                        ['order' => ['priority', 'retrial', 'created']]
                );
 
+               $max_duration_defaults = DI::config()->get('system', 'worker_max_duration');
+
                while ($entry = DBA::fetch($entries)) {
                        if (!posix_kill($entry["pid"], 0)) {
                                DBA::update('workerqueue', ['executed' => DBA::NULL_DATETIME, 'pid' => 0], ['id' => $entry["id"]]);
@@ -84,8 +86,10 @@ class Cron
                                // Kill long running processes
 
                                // Define the maximum durations
-                               $max_duration_defaults = [PRIORITY_CRITICAL => 720, PRIORITY_HIGH => 10, PRIORITY_MEDIUM => 60, PRIORITY_LOW => 180, PRIORITY_NEGLIGIBLE => 720];
-                               $max_duration          = $max_duration_defaults[$entry['priority']];
+                               $max_duration = $max_duration_defaults[$entry['priority']] ?? 0;
+                               if (empty($max_duration)) {
+                                       continue;
+                               }
 
                                $argv = json_decode($entry['parameter'], true);
                                if (!empty($entry['command'])) {
@@ -101,19 +105,19 @@ class Cron
                                // How long is the process already running?
                                $duration = (time() - strtotime($entry["executed"])) / 60;
                                if ($duration > $max_duration) {
-                                       Logger::notice('Worker process took too much time - killed', ['duration' => number_format($duration, 3), 'max' => $max_duration, 'id' => $entry["id"], 'pid' => $entry["pid"], 'command' => $command]);
+                                       Logger::warning('Worker process took too much time - killed', ['duration' => number_format($duration, 3), 'max' => $max_duration, 'id' => $entry["id"], 'pid' => $entry["pid"], 'command' => $command]);
                                        posix_kill($entry["pid"], SIGTERM);
 
                                        // We killed the stale process.
                                        // To avoid a blocking situation we reschedule the process at the beginning of the queue.
                                        // Additionally we are lowering the priority. (But not PRIORITY_CRITICAL)
                                        $new_priority = $entry['priority'];
-                                       if ($entry['priority'] == PRIORITY_HIGH) {
-                                               $new_priority = PRIORITY_MEDIUM;
-                                       } elseif ($entry['priority'] == PRIORITY_MEDIUM) {
-                                               $new_priority = PRIORITY_LOW;
-                                       } elseif ($entry['priority'] != PRIORITY_CRITICAL) {
-                                               $new_priority = PRIORITY_NEGLIGIBLE;
+                                       if ($entry['priority'] == Worker::PRIORITY_HIGH) {
+                                               $new_priority = Worker::PRIORITY_MEDIUM;
+                                       } elseif ($entry['priority'] == Worker::PRIORITY_MEDIUM) {
+                                               $new_priority = Worker::PRIORITY_LOW;
+                                       } elseif ($entry['priority'] != Worker::PRIORITY_CRITICAL) {
+                                               $new_priority = Worker::PRIORITY_NEGLIGIBLE;
                                        }
                                        DBA::update('workerqueue', ['executed' => DBA::NULL_DATETIME, 'created' => DateTimeFormat::utcNow(), 'priority' => $new_priority, 'pid' => 0], ['id' => $entry["id"]]
                                        );
@@ -162,13 +166,13 @@ class Cron
                                Logger::info('Directly deliver inbox', ['inbox' => $delivery['inbox'], 'result' => $result['success']]);
                                continue;
                        } elseif ($delivery['failed'] < 3) {
-                               $priority = PRIORITY_HIGH;
+                               $priority = Worker::PRIORITY_HIGH;
                        } elseif ($delivery['failed'] < 6) {
-                               $priority = PRIORITY_MEDIUM;
+                               $priority = Worker::PRIORITY_MEDIUM;
                        } elseif ($delivery['failed'] < 8) {
-                               $priority = PRIORITY_LOW;
+                               $priority = Worker::PRIORITY_LOW;
                        } else {
-                               $priority = PRIORITY_NEGLIGIBLE;
+                               $priority = Worker::PRIORITY_NEGLIGIBLE;
                        }
 
                        if ($delivery['failed'] >= DI::config()->get('system', 'worker_defer_limit')) {
@@ -189,7 +193,7 @@ class Cron
         */
        private static function addIntros()
        {
-               $contacts = DBA::p("SELECT `uid`, `id`, `created` FROM `contact` WHERE `rel` = ? AND `pending` AND NOT EXISTS (SELECT `id` FROM `intro` WHERE `contact-id` = `contact`.`id`)", Contact::FOLLOWER);
+               $contacts = DBA::p("SELECT `uid`, `id`, `created` FROM `contact` WHERE `rel` = ? AND `pending` AND NOT `id` IN (SELECT `contact-id` FROM `intro`)", Contact::FOLLOWER);
                while ($contact = DBA::fetch($contacts)) {
                        $fields = [
                                'uid'        => $contact['uid'],