server: Cleanup serve

Signed-off-by: Marek Siarkowicz <[email protected]>

server/embed/serve.go

@@ -115,16 +115,8 @@ func (sctx *serveCtx) serve(
 	servElection := v3election.NewElectionServer(v3c)
 	servLock := v3lock.NewLockServer(v3c)
 
-	var tlscfg *tls.Config
-
 	// Make sure serversC is closed even if we prematurely exit the function.
 	defer close(sctx.serversC)
-	if sctx.secure {
-		tlscfg, err = tlsinfo.ServerConfig()
-		if err != nil {
-			return err
-		}
-	}
 	gs := v3rpc.Server(s, nil, nil, gopts...)
 	defer func() {
 		sctx.lg.Warn("stopping grpc server due to error", zap.Error(err))
@@ -136,8 +128,14 @@ func (sctx *serveCtx) serve(
 	if sctx.serviceRegister != nil {
 		sctx.serviceRegister(gs)
 	}
-	var srv *http.Server
 	var gwmux *gw.ServeMux
+	var tlscfg *tls.Config
+	if sctx.secure {
+		tlscfg, err = tlsinfo.ServerConfig()
+		if err != nil {
+			return err
+		}
+	}
 	if s.Cfg.EnableGRPCGateway {
 		var creds credentials.TransportCredentials
 		if sctx.insecure {
@@ -158,6 +156,16 @@ func (sctx *serveCtx) serve(
 			return err
 		}
 	}
+	// TODO: add debug flag; enable logging when debug flag is set
+	srv := &http.Server{
+		Handler:  createAccessController(sctx.lg, s, sctx.createMux(gwmux, handler)),
+		ErrorLog: logger, // do not log user error
+	}
+	if err := configureHttpServer(srv, s.Cfg); err != nil {
+		sctx.lg.Error("Configure https server failed", zap.Error(err))
+		return err
+	}
+
 	listener := sctx.l
 	if sctx.secure {
 		listener, err = transport.NewTLSListener(listener, tlsinfo)
@@ -166,24 +174,10 @@ func (sctx *serveCtx) serve(
 		}
 	}
 	m := cmux.New(listener)
-	// TODO: add debug flag; enable logging when debug flag is set
-	httpmux := sctx.createMux(gwmux, handler)
-	srv = &http.Server{
-		Handler:  createAccessController(sctx.lg, s, httpmux),
-		ErrorLog: logger, // do not log user error
-	}
-	grpcl := m.Match(cmux.HTTP2())
-	go func() { errHandler(gs.Serve(grpcl)) }()
-
-	httpl := m.Match(cmux.HTTP1())
-	go func() { errHandler(srv.Serve(httpl)) }()
-	if err := configureHttpServer(srv, s.Cfg); err != nil {
-		sctx.lg.Error("Configure https server failed", zap.Error(err))
-		return err
-	}
+	go func() { errHandler(srv.Serve(m.Match(cmux.HTTP1()))) }()
+	go func() { errHandler(gs.Serve(m.Match(cmux.HTTP2()))) }()
 
 	sctx.serversC <- &servers{secure: sctx.secure, grpc: gs, http: srv}
-
 	msg := "serving client traffic securely"
 	if sctx.insecure {
 		msg = "serving client traffic insecurely; this is strongly discouraged!"