From 2c16c7e62f05f04633f859d55d9f305b17114fbe Mon Sep 17 00:00:00 2001 From: Asim Aslam Date: Mon, 9 Sep 2019 09:25:47 -0700 Subject: [PATCH] Fix build breaks --- registry/handler/handler.go | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/registry/handler/handler.go b/registry/handler/handler.go index 62604e41..f86148cd 100644 --- a/registry/handler/handler.go +++ b/registry/handler/handler.go @@ -14,40 +14,46 @@ type Registry struct { Registry registry.Registry } -func (r *Registry) GetService(ctx context.Context, req pb.GetRequest, rsp pb.GetResponse) error { +func (r *Registry) GetService(ctx context.Context, req *pb.GetRequest, rsp *pb.GetResponse) error { services, err := r.Registry.GetService(req.Service) + if err != nil { + return errors.InternalServerError("go.micro.registry", err.Error()) + } for _, srv := range services { rsp.Services = append(rsp.Services, service.ToProto(srv)) } return nil } -func (r *Registry) Register(ctx context.Context, req pb.Service, rsp pb.EmptyResponse) error { - err := r.Registry.Register(service.ToService(req.Service)) +func (r *Registry) Register(ctx context.Context, req *pb.Service, rsp *pb.EmptyResponse) error { + err := r.Registry.Register(service.ToService(req)) if err != nil { return errors.InternalServerError("go.micro.registry", err.Error()) } return nil } -func (r *Registry) Deregister(ctx context.Context, req pb.Service, rsp pb.EmptyResponse) error { - err := r.Registry.Deregister(service.ToService(req.Service)) +func (r *Registry) Deregister(ctx context.Context, req *pb.Service, rsp *pb.EmptyResponse) error { + err := r.Registry.Deregister(service.ToService(req)) if err != nil { return errors.InternalServerError("go.micro.registry", err.Error()) } return nil } -func (r *Registry) ListServices(ctx context.Context, req pb.ListRequest, rsp pb.ListResponse) error { +func (r *Registry) ListServices(ctx context.Context, req *pb.ListRequest, rsp *pb.ListResponse) error { services, err := r.Registry.ListServices() + if err != nil { + return errors.InternalServerError("go.micro.registry", err.Error()) + } for _, srv := range services { rsp.Services = append(rsp.Services, service.ToProto(srv)) } return nil } -func (r *Registry) Watch(ctx context.Context, req pb.WatchRequest, rsp pb.Registry_WatchStream) error { - watcher, err := r.Registry.Watcher(registry.WatchOption(req.Service)) +func (r *Registry) Watch(ctx context.Context, req *pb.WatchRequest, rsp pb.Registry_WatchStream) error { + watcher, err := r.Registry.Watch(registry.WatchService(req.Service)) if err != nil { return errors.InternalServerError("go.micro.registry", err.Error()) }