server: set registered only after configuring subscribers (#1557)

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>

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
 }
 

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
 }