From c828963e6bdb7c14597210987367f428cf481f33 Mon Sep 17 00:00:00 2001
From: kim <grufwub@gmail.com>
Date: Wed, 24 Apr 2024 13:44:12 +0100
Subject: [PATCH] reshuffle ordering or server.go + remove duplicate worker
 start / stop

---
 cmd/gotosocial/action/server/server.go | 36 ++++++++++----------------
 1 file changed, 13 insertions(+), 23 deletions(-)

diff --git a/cmd/gotosocial/action/server/server.go b/cmd/gotosocial/action/server/server.go
index e2d6ec3ea..22d8b3920 100644
--- a/cmd/gotosocial/action/server/server.go
+++ b/cmd/gotosocial/action/server/server.go
@@ -129,27 +129,6 @@ var Start action.GTSAction = func(ctx context.Context) error {
 		TLSInsecureSkipVerify: config.GetHTTPClientTLSInsecureSkipVerify(),
 	})
 
-	// Initialize delivery worker with http client.
-	state.Workers.Client.Init(messages.ClientMsgIndices())
-	state.Workers.Federator.Init(messages.FederatorMsgIndices())
-	state.Workers.Delivery.Init(client)
-
-	// Initialize workers.
-	state.Workers.Start()
-	defer state.Workers.Stop()
-
-	// Add a task to the scheduler to sweep caches.
-	// Frequency = 1 * minute
-	// Threshold = 60% capacity
-	_ = state.Workers.Scheduler.AddRecurring(
-		"@cachesweep", // id
-		time.Time{},   // start
-		time.Minute,   // freq
-		func(context.Context, time.Time) {
-			state.Caches.Sweep(60)
-		},
-	)
-
 	// Build handlers used in later initializations.
 	mediaManager := media.NewManager(&state)
 	oauthServer := oauth.New(ctx, dbService)
@@ -202,8 +181,19 @@ var Start action.GTSAction = func(ctx context.Context) error {
 	// (this is required for cleaner).
 	state.Workers.StartScheduler()
 
-	// Create a media cleaner
-	// using the given state.
+	// Add a task to the scheduler to sweep caches.
+	// Frequency = 1 * minute
+	// Threshold = 60% capacity
+	_ = state.Workers.Scheduler.AddRecurring(
+		"@cachesweep", // id
+		time.Time{},   // start
+		time.Minute,   // freq
+		func(context.Context, time.Time) {
+			state.Caches.Sweep(60)
+		},
+	)
+
+	// Create background cleaner.
 	cleaner := cleaner.New(&state)
 
 	// Create the processor using all the