]> git.mxchange.org Git - friendica.git/blobdiff - src/Core/Worker/Cron.php
Merge pull request #12316 from VVelox/load_fix
[friendica.git] / src / Core / Worker / Cron.php
index 0f2c4b41e7157e24e926f909a1517f4e83b40a92..4aef72e5f5112345aa58bf89ed8ff37f84e83d5b 100644 (file)
@@ -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();
@@ -112,12 +112,12 @@ class Cron
                                        // 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"]]
                                        );
@@ -159,31 +159,38 @@ class Cron
         */
        private static function deliverPosts()
        {
-               $deliveries = DBA::p("SELECT `item-uri`.`uri` AS `inbox`, MAX(`failed`) AS `failed` FROM `post-delivery` INNER JOIN `item-uri` ON `item-uri`.`id` = `post-delivery`.`inbox-id` GROUP BY `inbox`");
+               $deliveries = DBA::p("SELECT `item-uri`.`uri` AS `inbox`, MAX(`failed`) AS `failed` FROM `post-delivery` INNER JOIN `item-uri` ON `item-uri`.`id` = `post-delivery`.`inbox-id` GROUP BY `inbox` ORDER BY RAND()");
                while ($delivery = DBA::fetch($deliveries)) {
+                       if ($delivery['failed'] > 0) {
+                               Logger::info('Removing failed deliveries', ['inbox' => $delivery['inbox'], 'failed' => $delivery['failed']]);
+                               Post\Delivery::removeFailed($delivery['inbox']);
+                       }
+                               
                        if ($delivery['failed'] == 0) {
                                $result = ActivityPub\Delivery::deliver($delivery['inbox']);
                                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')) {
-                               Logger::info('Removing failed deliveries', ['inbox' => $delivery['inbox'], 'failed' => $delivery['failed']]);
-                               Post\Delivery::removeFailed($delivery['inbox']);
-                       }
-
-                       if (Worker::add($priority, 'APDelivery', '', 0, $delivery['inbox'], 0)) {
+                       if (Worker::add(['priority' => $priority, 'force_priority' => true], 'APDelivery', '', 0, $delivery['inbox'], 0)) {
                                Logger::info('Missing APDelivery worker added for inbox', ['inbox' => $delivery['inbox'], 'failed' => $delivery['failed'], 'priority' => $priority]);
                        }
                }
+
+               // Optimizing this table only last seconds
+               if (DI::config()->get('system', 'optimize_tables')) {
+                       Logger::info('Optimize start');
+                       DBA::e("OPTIMIZE TABLE `post-delivery`");
+                       Logger::info('Optimize end');
+               }
        }
 
        /**