<?php
/**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Contact;
+use Friendica\Model\GServer;
use Friendica\Model\Post;
use Friendica\Protocol\ActivityPub;
+use Friendica\Protocol\Delivery;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Strings;
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();
// Remove old entries from the workerqueue
self::cleanWorkerQueue();
- // Directly deliver or requeue posts
+ // Directly deliver or requeue posts to ActivityPub systems
+ self::deliverAPPosts();
+
+ // Directly deliver or requeue posts to other systems
self::deliverPosts();
}
// 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"]]
);
*
* This function is placed here as a safeguard. Even when the worker queue is completely blocked, messages will be delivered.
*/
- private static function deliverPosts()
+ private static function deliverAPPosts()
{
- $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(`gsid`) AS `gsid`, MAX(`shared`) AS `shared`, MAX(`failed`) AS `failed` FROM `post-delivery` INNER JOIN `item-uri` ON `item-uri`.`id` = `post-delivery`.`inbox-id` LEFT JOIN `inbox-status` ON `inbox-status`.`url` = `item-uri`.`uri` GROUP BY `inbox` ORDER BY RAND()");
while ($delivery = DBA::fetch($deliveries)) {
- if ($delivery['failed'] == 0) {
+ if ($delivery['failed'] > 0) {
+ Logger::info('Removing failed deliveries', ['inbox' => $delivery['inbox'], 'failed' => $delivery['failed']]);
+ Post\Delivery::removeFailed($delivery['inbox']);
+ }
+ if (($delivery['failed'] == 0) && $delivery['shared'] && !empty($delivery['gsid']) && GServer::isReachableById($delivery['gsid'])) {
$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' => $priority, 'force_priority' => true], 'APDelivery', '', 0, $delivery['inbox'], 0)) {
+ Logger::info('Priority for APDelivery worker adjusted', ['inbox' => $delivery['inbox'], 'failed' => $delivery['failed'], 'priority' => $priority]);
+ }
+ }
+
+ DBA::close($deliveries);
+
+ // 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');
+ }
+ }
+
+ /**
+ * Directly deliver messages or requeue them.
+ */
+ private static function deliverPosts()
+ {
+ $deliveries = DBA::p("SELECT `gsid`, MAX(`failed`) AS `failed` FROM `delivery-queue` GROUP BY `gsid` ORDER BY RAND()");
+ while ($delivery = DBA::fetch($deliveries)) {
+ if ($delivery['failed'] > 0) {
+ Logger::info('Removing failed deliveries', ['gsid' => $delivery['gsid'], 'failed' => $delivery['failed']]);
+ Delivery::removeFailedQueue($delivery['gsid']);
}
- if (Worker::add($priority, 'APDelivery', '', 0, $delivery['inbox'], 0)) {
- Logger::info('Missing APDelivery worker added for inbox', ['inbox' => $delivery['inbox'], 'failed' => $delivery['failed'], 'priority' => $priority]);
+ if (($delivery['failed'] < 3) || GServer::isReachableById($delivery['gsid'])) {
+ $priority = Worker::PRIORITY_HIGH;
+ } elseif ($delivery['failed'] < 6) {
+ $priority = Worker::PRIORITY_MEDIUM;
+ } elseif ($delivery['failed'] < 8) {
+ $priority = Worker::PRIORITY_LOW;
+ } else {
+ $priority = Worker::PRIORITY_NEGLIGIBLE;
+ }
+
+ if (Worker::add(['priority' => $priority, 'force_priority' => true], 'BulkDelivery', $delivery['gsid'])) {
+ Logger::info('Priority for BulkDelivery worker adjusted', ['gsid' => $delivery['gsid'], '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 `delivery-queue`");
+ Logger::info('Optimize end');
+ }
}
/**
projects / friendica.git / blobdiff