with stop

manager.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"os"
 	"sync"
+	"time"
 )
 
 const (
@@ -35,12 +36,13 @@ type ComponentsAreReady struct {
 
 func (m *Manager) RunNonBlocking(ctx context.Context, readyChan chan ComponentsAreReady) error {
 	go func() error {
-		defer func(ctx context.Context) {
+		defer func() {
+			ctx, _ := context.WithTimeout(context.Background(), time.Second*5)
 			err := m.shutdown(ctx)
 			if err != nil {
 				panic(err)
 			}
-		}(ctx)
+		}()
 		m.initLifetime()
 		err := m.init(ctx)
 		if err != nil {
@@ -164,9 +166,14 @@ func (m *Manager) initLifetime() {
 }
 
 func (m *Manager) wait(ctx context.Context) error {
-	exitCode := <-m.exitChan
+	select {
+	case exitCode := <-m.exitChan:
 		m.exitCode = exitCode
 		return nil
+	case <-ctx.Done():
+		return nil
+	}
+	return nil
 }
 
 func (m *Manager) shutdown(ctx context.Context) error {