with stop

manager.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"os"
 	"sync"
+	"time"
 )
 
 const (
@@ -30,9 +31,38 @@ func NewManager() *Manager {
 	}
 }
 
-func (m *Manager) RunNonBlocking(ctx context.Context) error {
-	go m.Run(ctx)
+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 {
+			return err
+		}
+
+		err = m.startBlocking(ctx)
+		if err != nil {
+			return err
+		}
+
+		readyChan <- ComponentsAreReady{}
+
+		err = m.wait(ctx)
+		if err != nil {
+			return err
+		}
+
+		return nil
+	}()
 	return nil
 }
 
@@ -98,6 +128,14 @@ func (m *Manager) start(ctx context.Context) error {
 	return nil
 }
 
+func (m *Manager) startBlocking(ctx context.Context) error {
+	for _, c := range m.components {
+		m.startComponent(ctx, c)
+	}
+
+	return nil
+}
+
 func (m *Manager) startComponent(ctx context.Context, component Component) {
 	defer func() {
 		err := recover()
@@ -128,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
 }