builder.go

@@ -3,9 +3,9 @@ package curre
 import "context"
 
 type FunctionalComponent struct {
-	InitFunc  func(fc *FunctionalComponent, ctx context.Context) error
-	StartFunc func(fc *FunctionalComponent, ctx context.Context) error
-	StopFunc  func(fc *FunctionalComponent, ctx context.Context) error
+	InitFunc  func(ctx context.Context) error
+	StartFunc func(ctx context.Context) error
+	StopFunc  func(ctx context.Context) error
 }
 
 func NewFunctionalComponent(
@@ -16,19 +16,19 @@ func NewFunctionalComponent(
 
 func (fc *FunctionalComponent) Init(ctx context.Context) error {
 	if fc.InitFunc != nil {
-		return fc.InitFunc(fc, ctx)
+		return fc.InitFunc(ctx)
 	}
 	return nil
 }
 func (fc *FunctionalComponent) Start(ctx context.Context) error {
 	if fc.StartFunc != nil {
-		return fc.StartFunc(fc, ctx)
+		return fc.StartFunc(ctx)
 	}
 	return nil
 }
 func (fc *FunctionalComponent) Stop(ctx context.Context) error {
 	if fc.StopFunc != nil {
-		return fc.StopFunc(fc, ctx)
+		return fc.StopFunc(ctx)
 	}
 	return nil
 }

manager.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"os"
 	"sync"
-	"time"
 )
 
 const (
@@ -31,37 +30,10 @@ func NewManager() *Manager {
 	}
 }
 
-type ComponentsAreReady struct {
-}
+func (m *Manager) RunNonBlocking(ctx context.Context) error {
+	go m.Run(ctx)
 
-type CleanupFunc func(ctx context.Context) error
-
-func (m *Manager) RunNonBlocking(ctx context.Context, readyChan chan ComponentsAreReady) (CleanupFunc, error) {
-	go func() error {
-		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 func(ctx context.Context) error {
-		return m.shutdown(ctx)
-	}, nil
+	return nil
 }
 
 func (m *Manager) Run(ctx context.Context) error {
@@ -126,14 +98,6 @@ 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()
@@ -164,13 +128,8 @@ func (m *Manager) initLifetime() {
 }
 
 func (m *Manager) wait(ctx context.Context) error {
-	select {
-	case exitCode := <-m.exitChan:
-		m.exitCode = exitCode
-		return nil
-	case <-ctx.Done():
-		return nil
-	}
+	exitCode := <-m.exitChan
+	m.exitCode = exitCode
 	return nil
 }