embed: stop *grpc.Server on *serveCtx serve error

If serve errors before *grpc.Server is sent to serversC, it should be closed manually. Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
etcd-io · Dec 8, 2017 · f3fe71d · f3fe71d
1 parent e3da56a
commit f3fe71d
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/embed/serve.go b/embed/serve.go
@@ -101,6 +101,7 @@ func (sctx *serveCtx) serve(
 		opts := []grpc.DialOption{grpc.WithInsecure()}
 		gwmux, err := sctx.registerGateway(opts)
 		if err != nil {
+			gs.Stop()
 			return err
 		}
 
@@ -137,11 +138,13 @@ func (sctx *serveCtx) serve(
 		opts := []grpc.DialOption{grpc.WithTransportCredentials(creds)}
 		gwmux, err := sctx.registerGateway(opts)
 		if err != nil {
+			gs.Stop()
 			return err
 		}
 
 		tlsl, lerr := transport.NewTLSListener(m.Match(cmux.Any()), tlsinfo)
 		if lerr != nil {
+			gs.Stop()
 			return lerr
 		}
 		// TODO: add debug flag; enable logging when debug flag is set