with stop

manager.go

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