server: fix gRPC gateway server close

Signed-off-by: Gyuho Lee <[email protected]>
ava-labs · May 13, 2022 · cf1cfdd · cf1cfdd
1 parent ecd5c55
commit cf1cfdd
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/server/server.go b/server/server.go
@@ -173,19 +173,23 @@ func (s *server) Run(rootCtx context.Context) (err error) {
 	case <-rootCtx.Done():
 		zap.L().Warn("root context is done")
 
-		zap.L().Warn("closed gRPC gateway server", zap.Error(s.gwServer.Close()))
-		<-gwErrc
+		if !s.cfg.GwDisabled {
+			zap.L().Warn("closed gRPC gateway server", zap.Error(s.gwServer.Close()))
+			<-gwErrc
+		}
 
 		s.gRPCServer.Stop()
 		zap.L().Warn("closed gRPC server")
 		<-gRPCErrc
 
 	case err = <-gRPCErrc:
 		zap.L().Warn("gRPC server failed", zap.Error(err))
-		zap.L().Warn("closed gRPC gateway server", zap.Error(s.gwServer.Close()))
-		<-gwErrc
+		if !s.cfg.GwDisabled {
+			zap.L().Warn("closed gRPC gateway server", zap.Error(s.gwServer.Close()))
+			<-gwErrc
+		}
 
-	case err = <-gwErrc:
+	case err = <-gwErrc: // if disabled, this will never be selected
 		zap.L().Warn("gRPC gateway server failed", zap.Error(err))
 		s.gRPCServer.Stop()
 		zap.L().Warn("closed gRPC server")