<?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\Core\Worker;
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;
/**
* Contains the class for jobs that are executed in an interval
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();
}
*/
public static function killStaleWorkers()
{
- $stamp = (float)microtime(true);
$entries = DBA::select(
'workerqueue',
['id', 'pid', 'executed', 'priority', 'command', 'parameter'],
['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)) {
- $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']] ?? 0;
+ if (empty($max_duration)) {
+ continue;
+ }
$argv = json_decode($entry['parameter'], true);
if (!empty($entry['command'])) {
// 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;
}
- $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]);
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()
+ 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('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;
+ $priority = Worker::PRIORITY_HIGH;
} elseif ($delivery['failed'] < 6) {
- $priority = PRIORITY_MEDIUM;
+ $priority = Worker::PRIORITY_MEDIUM;
} elseif ($delivery['failed'] < 8) {
- $priority = PRIORITY_LOW;
- } {
- $priority = PRIORITY_NEGLIGIBLE;
+ $priority = Worker::PRIORITY_LOW;
+ } else {
+ $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);
- 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]);
+ // 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 (($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');
+ }
+ }
+
+ /**
+ * 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 `id` IN (SELECT `contact-id` FROM `intro`)", 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);
}
}
}
projects / friendica.git / blobdiff