server: subscribe to topic with own name if router not nil (#1295)

* server: subscribe to topic with own name if router not nil

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

server/rpc_server.go

@@ -630,14 +630,17 @@ func (s *rpcServer) Register() error {
 	// set what we're advertising
 	s.opts.Advertise = addr
 
-	// subscribe to the topic with own name
+	// router can exchange messages
-	sub, err := s.opts.Broker.Subscribe(config.Name, s.HandleEvent)
+	if s.opts.Router != nil {
-	if err != nil {
+		// subscribe to the topic with own name
-		return err
+		sub, err := s.opts.Broker.Subscribe(config.Name, s.HandleEvent)
-	}
+		if err != nil {
+			return err
+		}
 
-	// save the subscriber
+		// save the subscriber
-	s.subscriber = sub
+		s.subscriber = sub
+	}
 
 	// subscribe for all of the subscribers
 	for sb := range s.subscribers {
@@ -654,11 +657,11 @@ func (s *rpcServer) Register() error {
 			opts = append(opts, broker.DisableAutoAck())
 		}
 
-		log.Infof("Subscribing to topic: %s", sub.Topic())
 		sub, err := config.Broker.Subscribe(sb.Topic(), s.HandleEvent, opts...)
 		if err != nil {
 			return err
 		}
+		log.Infof("Subscribing to topic: %s", sub.Topic())
 
 		s.subscribers[sb] = []broker.Subscriber{sub}
 	}