Loglevels are adjusted

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

diff --git a/src/Core/Worker/Cron.php b/src/Core/Worker/Cron.php
index b07c47275054a13d8a249739d86915ad397d5c62..9db954298ad3b243e3bfbed71affad1685963986 100644 (file)
--- a/src/Core/Worker/Cron.php
+++ b/src/Core/Worker/Cron.php
@@ -25,9 +25,11 @@ use Friendica\Core\Logger;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Model\Contact;
 use Friendica\Model\Post;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Strings;
 
 /**
  * Contains the class for jobs that are executed in an interval
@@ -68,7 +70,6 @@ class Cron
         */
        public static function killStaleWorkers()
        {
-               $stamp = (float)microtime(true);
                $entries = DBA::select(
                        'workerqueue',
                        ['id', 'pid', 'executed', 'priority', 'command', 'parameter'],
@@ -78,18 +79,13 @@ class Cron
 
                while ($entry = DBA::fetch($entries)) {
                        if (!posix_kill($entry["pid"], 0)) {
-                               $stamp = (float)microtime(true);
-                               DBA::update(
-                                       'workerqueue',
-                                       ['executed' => DBA::NULL_DATETIME, 'pid' => 0],
-                                       ['id' => $entry["id"]]
-                               );
+                               DBA::update('workerqueue', ['executed' => DBA::NULL_DATETIME, 'pid' => 0], ['id' => $entry["id"]]);
                        } else {
                                // 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']];
 
                                $argv = json_decode($entry['parameter'], true);
                                if (!empty($entry['command'])) {
@@ -105,7 +101,7 @@ 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.
@@ -119,11 +115,7 @@ class Cron
                                        } elseif ($entry['priority'] != PRIORITY_CRITICAL) {
                                                $new_priority = PRIORITY_NEGLIGIBLE;
                                        }
-                                       $stamp = (float)microtime(true);
-                                       DBA::update(
-                                               'workerqueue',
-                                               ['executed' => DBA::NULL_DATETIME, 'created' => DateTimeFormat::utcNow(), 'priority' => $new_priority, 'pid' => 0],
-                                               ['id' => $entry["id"]]
+                                       DBA::update('workerqueue', ['executed' => DBA::NULL_DATETIME, 'created' => DateTimeFormat::utcNow(), 'priority' => $new_priority, 'pid' => 0], ['id' => $entry["id"]]
                                        );
                                } else {
                                        Logger::info('Process runtime is okay', ['duration' => number_format($duration, 3), 'max' => $max_duration, 'id' => $entry["id"], 'pid' => $entry["pid"], 'command' => $command]);
@@ -154,11 +146,11 @@ class Cron
                                DI::lock()->release(Worker::LOCK_PROCESS);
                        }
                }
-       }       
+       }
 
        /**
         * Directly deliver AP messages or requeue them.
-        * 
+        *
         * This function is placed here as a safeguard. Even when the worker queue is completely blocked, messages will be delivered.
         */
        private static function deliverPosts()
@@ -167,7 +159,7 @@ class Cron
                while ($delivery = DBA::fetch($deliveries)) {
                        if ($delivery['failed'] == 0) {
                                $result = ActivityPub\Delivery::deliver($delivery['inbox']);
-                               Logger::info('Drectly deliver inbox', ['inbox' => $delivery['inbox'], 'result' => $result['success']]);
+                               Logger::info('Directly deliver inbox', ['inbox' => $delivery['inbox'], 'result' => $result['success']]);
                                continue;
                        } elseif ($delivery['failed'] < 3) {
                                $priority = PRIORITY_HIGH;
@@ -175,7 +167,7 @@ class Cron
                                $priority = PRIORITY_MEDIUM;
                        } elseif ($delivery['failed'] < 8) {
                                $priority = PRIORITY_LOW;
-                       } {
+                       } else {
                                $priority = PRIORITY_NEGLIGIBLE;
                        }
 
@@ -189,4 +181,24 @@ class Cron
                        }
                }
        }
+
+       /**
+        * Add missing "intro" records.
+        *
+        * @return void
+        */
+       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);
+               while ($contact = DBA::fetch($contacts)) {
+                       $fields = [
+                               'uid'        => $contact['uid'],
+                               'contact-id' => $contact['id'],
+                               'datetime'   => $contact['created'],
+                               'hash'       => Strings::getRandomHex()
+                       ];
+                       Logger::notice('Adding missing intro', ['fields' => $fields]);
+                       DBA::insert('intro', $fields);
+               }
+       }
 }