Check if listener is not nil before closing it

gatewayd-io · Oct 15, 2023 · 6d1e6db · 6d1e6db
1 parent 068f03c
commit 6d1e6db
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/network/engine.go b/network/engine.go
@@ -52,10 +52,12 @@ func (engine *Engine) Stop(ctx context.Context) error {
 	defer cancel()
 
 	engine.running.Store(false)
-	if err := engine.listener.Close(); err != nil {
-		engine.stopServer <- struct{}{}
-		close(engine.stopServer)
-		return gerr.ErrCloseListenerFailed.Wrap(err)
+	if engine.listener != nil {
+		if err := engine.listener.Close(); err != nil {
+			engine.stopServer <- struct{}{}
+			close(engine.stopServer)
+			return gerr.ErrCloseListenerFailed.Wrap(err)
+		}
 	}
 	engine.stopServer <- struct{}{}
 	close(engine.stopServer)