fix: prevent race with test exitCh

Signed-off-by: Marko Kungla <marko@mkungla.dev>
happy-sdk · Jun 3, 2024 · aeea8ba · aeea8ba
1 parent aad69a9
commit aeea8ba
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/sdk/app/app-main.go b/sdk/app/app-main.go
@@ -170,10 +170,12 @@ func (m *Main) Run() {
 		m.init = nil
 	}
 
+	exitCh := m.rt.ExitCh()
+
 	go func() {
 		m.rt.Start()
 	}()
-	osmain(m.rt.ExitCh())
+	osmain(exitCh)
 }
 
 func (m *Main) Do(a action.WithArgs) *Main {

diff --git a/sdk/app/internal/application/runtime.go b/sdk/app/internal/application/runtime.go
@@ -402,7 +402,7 @@ type ShutDown struct{}
 
 // ExitCh return blocking channel that will reveive a signal when the runtime exits
 func (rt *Runtime) ExitCh() <-chan ShutDown {
-	if testing.Testing() {
+	if testing.Testing() && rt.exitCh == nil {
 		rt.exitCh = make(chan ShutDown, 1)
 	}
 	return rt.exitCh