Rename hrpc to tcpServer

crosbymichael · crosbymichael · commit 97d247cd0f63 · 2019-04-11T15:06:06.000-04:00
Signed-off-by: Michael Crosby &lt;crosbymichael@gmail.com&gt;
diff --git a/services/server/server.go b/services/server/server.go
@@ -107,15 +107,15 @@ 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
 		ttrpcServices []plugin.TTRPCService
 
 		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
