From bea092f082ecfbd3fcfe82dee8bedc74b02b628e Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Tue, 21 Apr 2020 23:01:59 +0300 Subject: [PATCH] server: set registered only after configuring subscribers (#1557) Signed-off-by: Vasiliy Tolstov --- server/grpc/grpc.go | 10 +++++----- server/rpc_server.go | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/server/grpc/grpc.go b/server/grpc/grpc.go index 393f4f99..449455f2 100644 --- a/server/grpc/grpc.go +++ b/server/grpc/grpc.go @@ -692,11 +692,6 @@ func (g *grpcServer) Register() error { g.Lock() defer g.Unlock() - if cacheService { - g.rsvc = service - } - g.registered = true - for sb := range g.subscribers { handler := g.createSubHandler(sb, g.opts) var opts []broker.SubscribeOption @@ -722,6 +717,11 @@ func (g *grpcServer) Register() error { g.subscribers[sb] = []broker.Subscriber{sub} } + g.registered = true + if cacheService { + g.rsvc = service + } + return nil } diff --git a/server/rpc_server.go b/server/rpc_server.go index 5bb5740d..659b257c 100644 --- a/server/rpc_server.go +++ b/server/rpc_server.go @@ -650,10 +650,6 @@ func (s *rpcServer) Register() error { s.Lock() defer s.Unlock() - if cacheService { - s.rsvc = service - } - s.registered = true // set what we're advertising s.opts.Advertise = addr @@ -693,6 +689,10 @@ func (s *rpcServer) Register() error { } s.subscribers[sb] = []broker.Subscriber{sub} } + if cacheService { + s.rsvc = service + } + s.registered = true return nil }