X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FCron.php;h=1901766d3ac1d4d341f69322388c902ae8704b44;hb=bf8fb215a9cc554b5ec5b774168a52fb56fa43e6;hp=8ede97c2e48783ef891a9b24240e46798a49a7a9;hpb=8623c075af6e02ca96272e4ae96e363be2c6926f;p=friendica.git

diff --git a/src/Worker/Cron.php b/src/Worker/Cron.php
index 8ede97c2e4..1901766d3a 100644
--- a/src/Worker/Cron.php
+++ b/src/Worker/Cron.php
@@ -55,13 +55,16 @@ class Cron
 		}
 
 		// 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 +75,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()) {
 
@@ -96,8 +96,8 @@ class Cron
 			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');
 
@@ -106,16 +106,21 @@ class Cron
 			// update nodeinfo data
 			Worker::add(PRIORITY_LOW, 'NodeInfo');
 
-			Worker::add(PRIORITY_LOW, 'UpdateGServers');
+			// Repair entries in the database
+			Worker::add(PRIORITY_LOW, 'RepairDatabase');
 
 			Worker::add(PRIORITY_LOW, 'Expire');
 
-			Worker::add(PRIORITY_MEDIUM, 'DBClean');
+			Worker::add(PRIORITY_LOW, 'ExpirePosts');
 
 			Worker::add(PRIORITY_LOW, 'ExpireConversations');
 
 			Worker::add(PRIORITY_LOW, 'CleanItemUri');
 
+			Worker::add(PRIORITY_LOW, 'RemoveUnusedContacts');
+
+			Worker::add(PRIORITY_LOW, 'RemoveUnusedAvatars');
+
 			// check upstream version?
 			Worker::add(PRIORITY_LOW, 'CheckVersion');