X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FWorker%2FCron.php;h=11631e02b341e4594bd6774d1919c446aa4914d0;hb=26e0469de77aeae2311e8b50b5e64b58a388ca01;hp=9db954298ad3b243e3bfbed71affad1685963986;hpb=2a2e1a9e1271a85165fb6116999bca2fe1a71327;p=friendica.git

diff --git a/src/Core/Worker/Cron.php b/src/Core/Worker/Cron.php
index 9db954298a..11631e02b3 100644
--- a/src/Core/Worker/Cron.php
+++ b/src/Core/Worker/Cron.php
@@ -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();
@@ -77,6 +77,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 +86,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 +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"]]
 					);
@@ -162,13 +166,13 @@ class Cron
 				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')) {
@@ -189,7 +193,7 @@ class Cron
 	 */
 	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);
+		$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'],