From 97d247cd0f63e7eaeb4145ad6d5c56ddcb8b6245 Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Thu, 11 Apr 2019 15:06:06 -0400 Subject: [PATCH] Rename `hrpc` to `tcpServer` Signed-off-by: Michael Crosby --- services/server/server.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/services/server/server.go b/services/server/server.go index c5f30d924..ed4e8b9f5 100644 --- a/services/server/server.go +++ b/services/server/server.go @@ -107,7 +107,7 @@ func New(ctx context.Context, config *srvconfig.Config) (*Server, error) { } var ( grpcServer = grpc.NewServer(serverOpts...) - hrpc = grpc.NewServer(tcpServerOpts...) + tcpServer = grpc.NewServer(tcpServerOpts...) grpcServices []plugin.Service tcpServices []plugin.TCPService @@ -115,7 +115,7 @@ func New(ctx context.Context, config *srvconfig.Config) (*Server, error) { s = &Server{ grpcServer: grpcServer, - hrpc: hrpc, + tcpServer: tcpServer, ttrpcServer: ttrpcServer, events: exchange.NewExchange(), config: config, @@ -199,7 +199,7 @@ func New(ctx context.Context, config *srvconfig.Config) (*Server, error) { } } for _, service := range tcpServices { - if err := service.RegisterTCP(hrpc); err != nil { + if err := service.RegisterTCP(tcpServer); err != nil { return nil, err } } @@ -210,7 +210,7 @@ func New(ctx context.Context, config *srvconfig.Config) (*Server, error) { type Server struct { grpcServer *grpc.Server ttrpcServer *ttrpc.Server - hrpc *grpc.Server + tcpServer *grpc.Server events *exchange.Exchange config *srvconfig.Config plugins []*plugin.Plugin @@ -243,8 +243,8 @@ func (s *Server) ServeMetrics(l net.Listener) error { // ServeTCP allows services to serve over tcp func (s *Server) ServeTCP(l net.Listener) error { - grpc_prometheus.Register(s.hrpc) - return trapClosedConnErr(s.hrpc.Serve(l)) + grpc_prometheus.Register(s.tcpServer) + return trapClosedConnErr(s.tcpServer.Serve(l)) } // ServeDebug provides a debug endpoint