fix: register shutdown hooks for services after app's mutext is unlocked

mdelapenya · mdelapenya · commit a7eed3b4c485 · 2025-05-19T12:41:18.000+02:00
diff --git a/app.go b/app.go
@@ -1142,6 +1142,15 @@ func (app *App) init() *App {
 
 	// unlock application
 	app.mutex.Unlock()
+
+	// Register the Services shutdown handler once the app is initialized and unlocked.
+	app.Hooks().OnPostShutdown(func(_ error) error {
+		if err := app.shutdownServices(app.servicesShutdownCtx()); err != nil {
+			log.Errorf("failed to shutdown services: %v", err)
+		}
+		return nil
+	})
+
 	return app
 }
 
diff --git a/services.go b/services.go
@@ -6,8 +6,6 @@ import (
 	"fmt"
 	"io"
 	"strings"
-
-	"github.com/gofiber/fiber/v3/log"
 )
 
 // Service is an interface that defines the methods for a service.
@@ -42,17 +40,6 @@ func (app *App) initServices() {
 	if err := app.startServices(app.servicesStartupCtx()); err != nil {
 		panic(err)
 	}
-
-	// Create the shutdown handler before registering the hook
-	shutdownHandler := func(_ error) error {
-		if err := app.shutdownServices(app.servicesShutdownCtx()); err != nil {
-			log.Errorf("failed to shutdown services: %v", err)
-		}
-		return nil
-	}
-
-	// Register the pre-created handler
-	app.Hooks().OnPostShutdown(shutdownHandler)
 }
 
 // servicesStartupCtx Returns the context for the services startup.
diff --git a/services_test.go b/services_test.go
@@ -132,7 +132,9 @@ func Test_InitServices(t *testing.T) {
 		require.NotPanics(t, app.initServices)
 	})
 
-	t.Run("successful-start", func(t *testing.T) {
+	t.Run("start/success", func(t *testing.T) {
+		// Initialize the app using the struct and defining the state and hooks manually,
+		// because we are not checking the shutdown hooks in this test.
 		app := &App{
 			configured: Config{
 				Services: []Service{
@@ -148,7 +150,9 @@ func Test_InitServices(t *testing.T) {
 		require.NotPanics(t, app.initServices)
 	})
 
-	t.Run("failed-start", func(t *testing.T) {
+	t.Run("start/error", func(t *testing.T) {
+		// Initialize the app using the struct and defining the state and hooks manually,
+		// because we are not checking the shutdown hooks in this test.
 		app := &App{
 			configured: Config{
 				Services: []Service{
@@ -166,14 +170,11 @@ func Test_InitServices(t *testing.T) {
 	})
 
 	t.Run("shutdown-hooks/success", func(t *testing.T) {
-		app := &App{
-			configured: Config{
-				Services: []Service{&mockService{name: "dep1"}},
-			},
-			state: newState(),
-		}
-
-		app.hooks = newHooks(app)
+		// Initialize the app using the New function to verify that the shutdown hooks are registered
+		// and the app mutex is not causing a deadlock.
+		app := New(Config{
+			Services: []Service{&mockService{name: "dep1"}},
+		})
 
 		require.NotPanics(t, app.initServices)
 
@@ -190,17 +191,14 @@ func Test_InitServices(t *testing.T) {
 	})
 
 	t.Run("shutdown-hooks/error", func(t *testing.T) {
-		app := &App{
-			configured: Config{
-				Services: []Service{
-					&mockService{name: "dep1"},
-					&mockService{name: "dep2", terminateError: errors.New(terminateErrorMessage + " 2")},
-				},
+		// Initialize the app using the New function to verify that the shutdown hooks are registered
+		// and the app mutex is not causing a deadlock.
+		app := New(Config{
+			Services: []Service{
+				&mockService{name: "dep1"},
+				&mockService{name: "dep2", terminateError: errors.New(terminateErrorMessage + " 2")},
 			},
-			state: newState(),
-		}
-
-		app.hooks = newHooks(app)
+		})
 
 		require.NotPanics(t, app.initServices)
 
