Fix goroutine leak

stellar · Jun 13, 2024 · 8908c62 · 8908c62
1 parent c624ce1
commit 8908c62
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/cmd/soroban-rpc/internal/test/integration.go b/cmd/soroban-rpc/internal/test/integration.go
@@ -341,8 +341,10 @@ func (i *Test) runComposeCommand(args ...string) {
 }
 
 func (i *Test) prepareShutdownHandlers() {
+	done := make(chan struct{})
 	i.shutdownCalls = append(i.shutdownCalls,
 		func() {
+			close(done)
 			i.StopRPC()
 			if i.historyArchiveProxy != nil {
 				i.historyArchiveProxy.Close()
@@ -358,9 +360,12 @@ func (i *Test) prepareShutdownHandlers() {
 	c := make(chan os.Signal, 1)
 	signal.Notify(c, os.Interrupt, syscall.SIGTERM)
 	go func() {
-		<-c
-		i.Shutdown()
-		os.Exit(int(syscall.SIGTERM))
+		select {
+		case <-c:
+			i.Shutdown()
+			os.Exit(int(syscall.SIGTERM))
+		case <-done:
+		}
 	}()
 }