X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FWorker%2FCron.php;h=21f67c030bab8a96333707e216a9efa98e2adacd;hb=4faf08c0643d3e6bbe2a0a77be2ff8c1dbea4d5c;hp=800f0c8f9a10de87ba22ddbd742658e60cb40967;hpb=5a236e0af2b815777261ce4e8dd6965deb8bdde6;p=friendica.git

diff --git a/src/Core/Worker/Cron.php b/src/Core/Worker/Cron.php
index 800f0c8f9a..21f67c030b 100644
--- a/src/Core/Worker/Cron.php
+++ b/src/Core/Worker/Cron.php
@@ -1,6 +1,6 @@
 <?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
  *
@@ -26,8 +26,10 @@ 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;
 
@@ -47,10 +49,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();
@@ -58,7 +60,10 @@ class Cron
 		// 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();
 	}
 
@@ -77,6 +82,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 +91,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'])) {
@@ -108,12 +117,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"]]
 					);
@@ -153,33 +162,76 @@ class Cron
 	 *
 	 * 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 (($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, 'APDelivery', '', 0, $delivery['inbox'], 0)) {
-				Logger::info('Missing APDelivery worker added for inbox', ['inbox' => $delivery['inbox'], 'failed' => $delivery['failed'], 'priority' => $priority]);
+			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');
+		}
 	}
 
 	/**