with callback instead

manager.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"os"
 	"sync"
+	"time"
 )
 
 const (
@@ -33,28 +34,34 @@ func NewManager() *Manager {
 type ComponentsAreReady struct {
 }
 
-func (m *Manager) RunNonBlocking(ctx context.Context) error {
+type CleanupFunc func(ctx context.Context) error
-	m.initLifetime()
-	err := m.init(ctx)
-	if err != nil {
-		return err
-	}
 
-	err = m.startBlocking(ctx)
+func (m *Manager) RunNonBlocking(ctx context.Context, readyChan chan ComponentsAreReady) (CleanupFunc, error) {
-	if err != nil {
+	go func() error {
-		return err
+		m.initLifetime()
-	}
+		err := m.init(ctx)
+		if err != nil {
+			return err
+		}
 
-	err = m.wait(ctx)
+		err = m.startBlocking(ctx)
-	if err != nil {
+		if err != nil {
-		return err
+			return err
-	}
+		}
 
-	err = m.shutdown(ctx)
+		readyChan <- ComponentsAreReady{}
-	if err != nil {
+
-		return err
+		err = m.wait(ctx)
-	}
+		if err != nil {
-	return nil
+			return err
+		}
+
+		return nil
+	}()
+
+	return func(ctx context.Context) error {
+		return m.shutdown(ctx)
+	}, nil
 }
 
 func (m *Manager) Run(ctx context.Context) error {
@@ -157,8 +164,13 @@ func (m *Manager) initLifetime() {
 }
 
 func (m *Manager) wait(ctx context.Context) error {
-	exitCode := <-m.exitChan
+	select {
-	m.exitCode = exitCode
+	case exitCode := <-m.exitChan:
+		m.exitCode = exitCode
+		return nil
+	case <-ctx.Done():
+		return nil
+	}
 	return nil
 }