Don't send on a closed channel

gatewayd-io · Oct 15, 2023 · 909a23c · 909a23c
1 parent ac85264
commit 909a23c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/network/engine.go b/network/engine.go
@@ -45,9 +45,16 @@ func (engine *Engine) Stop(ctx context.Context) error {
 	} else {
 		engine.logger.Error().Msg("Listener is not initialized")
 	}
-	engine.stopServer <- struct{}{}
-	close(engine.stopServer)
-	return err //nolint:wrapcheck
+
+	select {
+	case <-engine.stopServer:
+		engine.logger.Info().Msg("Server stopped")
+		return err //nolint:wrapcheck
+	default:
+		engine.stopServer <- struct{}{}
+		close(engine.stopServer)
+		return err //nolint:wrapcheck
+	}
 }
 
 // NewEngine creates a new engine.

diff --git a/network/engine_test.go b/network/engine_test.go
@@ -44,8 +44,6 @@ func TestEngine(t *testing.T) {
 		assert.Zero(t, engine.connections)
 	})
 
-	t.Log(output)
-
 	// Expected output:
 	assert.Contains(t, output, "ERR Listener is not initialized")
 }