github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Rename hrpc to tcpServer

Browse Source 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2019-04-11 15:06:06 -04:00
parent 5f4c977ba0
commit 97d247cd0f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
services/server/server.go
View File

@ -107,7 +107,7 @@ func New(ctx context.Context, config *srvconfig.Config) (*Server, error) {
} }
var ( var (
grpcServer = grpc.NewServer(serverOpts...) grpcServer = grpc.NewServer(serverOpts...)
hrpc = grpc.NewServer(tcpServerOpts...) tcpServer = grpc.NewServer(tcpServerOpts...)
grpcServices []plugin.Service grpcServices []plugin.Service
tcpServices []plugin.TCPService tcpServices []plugin.TCPService
@ -115,7 +115,7 @@ func New(ctx context.Context, config *srvconfig.Config) (*Server, error) {
s = &Server{ s = &Server{
grpcServer: grpcServer, grpcServer: grpcServer,
hrpc: hrpc, tcpServer: tcpServer,
ttrpcServer: ttrpcServer, ttrpcServer: ttrpcServer,
events: exchange.NewExchange(), events: exchange.NewExchange(),
config: config, config: config,
@ -199,7 +199,7 @@ func New(ctx context.Context, config *srvconfig.Config) (*Server, error) {
} }
} }
for _, service := range tcpServices { for _, service := range tcpServices {
if err := service.RegisterTCP(hrpc); err != nil { if err := service.RegisterTCP(tcpServer); err != nil {
return nil, err return nil, err
} }
} }
@ -210,7 +210,7 @@ func New(ctx context.Context, config *srvconfig.Config) (*Server, error) {
type Server struct { type Server struct {
grpcServer *grpc.Server grpcServer *grpc.Server
ttrpcServer *ttrpc.Server ttrpcServer *ttrpc.Server
hrpc *grpc.Server tcpServer *grpc.Server
events *exchange.Exchange events *exchange.Exchange
config *srvconfig.Config config *srvconfig.Config
plugins []*plugin.Plugin plugins []*plugin.Plugin
@ -243,8 +243,8 @@ func (s *Server) ServeMetrics(l net.Listener) error {
// ServeTCP allows services to serve over tcp // ServeTCP allows services to serve over tcp
func (s *Server) ServeTCP(l net.Listener) error { func (s *Server) ServeTCP(l net.Listener) error {
grpc_prometheus.Register(s.hrpc) grpc_prometheus.Register(s.tcpServer)
return trapClosedConnErr(s.hrpc.Serve(l)) return trapClosedConnErr(s.tcpServer.Serve(l))
} }
// ServeDebug provides a debug endpoint // ServeDebug provides a debug endpoint