X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FCron.php;h=01c54fed1845576124498faf43d02f712bb52eb9;hb=34030a736d5e0aa2195c0f472cf69f863c161d83;hp=8ede97c2e48783ef891a9b24240e46798a49a7a9;hpb=b81206549922d7509a5865cb08733ff75b4d7a98;p=friendica.git

diff --git a/src/Worker/Cron.php b/src/Worker/Cron.php
index 8ede97c2e4..01c54fed18 100644
--- a/src/Worker/Cron.php
+++ b/src/Worker/Cron.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -24,6 +24,7 @@ namespace Friendica\Worker;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Worker;
+use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Tag;
 
@@ -54,14 +55,21 @@ class Cron
 			copy($basepath . '/.htaccess-dist', $basepath . '/.htaccess');
 		}
 
+		if (DI::config()->get('system', 'delete_sleeping_processes')) {
+			self::deleteSleepingProcesses();
+		}
+
 		// Fork the cron jobs in separate parts to avoid problems when one of them is crashing
-		Hook::fork($a->queue['priority'], 'cron');
+		Hook::fork(PRIORITY_MEDIUM, 'cron');
 
 		// Poll contacts
 		Worker::add(PRIORITY_MEDIUM, 'PollContacts');
 
 		// Update contact information
-		Worker::add(PRIORITY_LOW, 'UpdatePublicContacts');		
+		Worker::add(PRIORITY_LOW, 'UpdateContacts');
+
+		// Update server information
+		Worker::add(PRIORITY_LOW, 'UpdateGServers');
 
 		// run the process to update server directories in the background
 		Worker::add(PRIORITY_LOW, 'UpdateServerDirectories');
@@ -72,9 +80,6 @@ class Cron
 		// Call possible post update functions
 		Worker::add(PRIORITY_LOW, 'PostUpdate');
 
-		// Repair entries in the database
-		Worker::add(PRIORITY_LOW, 'RepairDatabase');
-
 		// Hourly cron calls
 		if (DI::config()->get('system', 'last_cron_hourly', 0) + 3600 < time()) {
 
@@ -87,34 +92,28 @@ class Cron
 				Worker::add(PRIORITY_LOW, 'PullDirectory');
 			}
 
-			// Delete all done workerqueue entries			
-			Worker::add(PRIORITY_LOW, 'CleanWorkerQueue');
-
 			// Clear cache entries
 			Worker::add(PRIORITY_LOW, 'ClearCache');
 
 			DI::config()->set('system', 'last_cron_hourly', time());
 		}
 
-		// Daily cron calls
-		if (DI::config()->get('system', 'last_cron_daily', 0) + 86400 < time()) {
+		// Daily maintenance cron calls
+		if (Worker::isInMaintenanceWindow(true)) {
 
 			Worker::add(PRIORITY_LOW, 'UpdateContactBirthdays');
 
 			Worker::add(PRIORITY_LOW, 'UpdatePhotoAlbums');
 
-			// update nodeinfo data
-			Worker::add(PRIORITY_LOW, 'NodeInfo');
-
-			Worker::add(PRIORITY_LOW, 'UpdateGServers');
+			Worker::add(PRIORITY_LOW, 'ExpirePosts');
 
-			Worker::add(PRIORITY_LOW, 'Expire');
+			Worker::add(PRIORITY_LOW, 'ExpireConversations');
 
-			Worker::add(PRIORITY_MEDIUM, 'DBClean');
+			Worker::add(PRIORITY_LOW, 'RemoveUnusedTags');
 
-			Worker::add(PRIORITY_LOW, 'ExpireConversations');
+			Worker::add(PRIORITY_LOW, 'RemoveUnusedContacts');
 
-			Worker::add(PRIORITY_LOW, 'CleanItemUri');
+			Worker::add(PRIORITY_LOW, 'RemoveUnusedAvatars');
 
 			// check upstream version?
 			Worker::add(PRIORITY_LOW, 'CheckVersion');
@@ -132,4 +131,25 @@ class Cron
 
 		DI::config()->set('system', 'last_cron', time());
 	}
+
+	/**
+	 * Kill sleeping database processes
+	 *
+	 * @return void
+	 */
+	private static function deleteSleepingProcesses()
+	{
+		Logger::info('Looking for sleeping processes');
+		
+		$processes = DBA::p("SHOW FULL PROCESSLIST");
+		while ($process = DBA::fetch($processes)) {
+			if (($process['Command'] != 'Sleep') || ($process['Time'] < 300) || ($process['db'] != DBA::databaseName())) {
+				continue;
+			}
+
+			DBA::e("KILL ?", $process['Id']);
+			Logger::notice('Killed sleeping process', ['id' => $process['Id']]);
+		}
+		DBA::close($processes);
+	}
 }