with callback instead

manager.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"os"
 	"sync"
+	"time"
 )
 
 const (
@@ -33,14 +34,10 @@ func NewManager() *Manager {
 type ComponentsAreReady struct {
 }
 
-func (m *Manager) RunNonBlocking(ctx context.Context, readyChan chan ComponentsAreReady) error {
+type CleanupFunc func(ctx context.Context) error
+
+func (m *Manager) RunNonBlocking(ctx context.Context, readyChan chan ComponentsAreReady) (CleanupFunc, error) {
 	go func() error {
-		defer func(ctx context.Context) {
-			err := m.shutdown(ctx)
-			if err != nil {
-				panic(err)
-			}
-		}(ctx)
 		m.initLifetime()
 		err := m.init(ctx)
 		if err != nil {
@@ -61,7 +58,10 @@ func (m *Manager) RunNonBlocking(ctx context.Context, readyChan chan ComponentsA
 
 		return nil
 	}()
-	return nil
+
+	return func(ctx context.Context) error {
+		return m.shutdown(ctx)
+	}, nil
 }
 
 func (m *Manager) Run(ctx context.Context) error {
@@ -164,8 +164,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
 }