various fixes for broker and messaging in server (#1187)

* provide broker disconnect messages in server

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

* broker/eats: another fix

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

broker/default.go

@@ -240,6 +240,10 @@ func (n *natsBroker) serve(exit chan bool) error {
 		// register the cluster address
 		for {
 			select {
+			case err := <-n.closeCh:
+				if err != nil {
+					log.Log(err)
+				}
 			case <-exit:
 				// deregister on exit
 				n.opts.Registry.Deregister(&registry.Service{
@@ -282,7 +286,6 @@ func (n *natsBroker) Connect() error {
 		}
 
 		// set to connected
-		n.connected = true
 	}
 
 	status := nats.CLOSED
@@ -313,6 +316,9 @@ func (n *natsBroker) Connect() error {
 			return err
 		}
 		n.conn = c
+
+		n.connected = true
+
 		return nil
 	}
 }
@@ -328,7 +334,6 @@ func (n *natsBroker) Disconnect() error {
 	// drain the connection if specified
 	if n.drain {
 		n.conn.Drain()
-		n.closeCh <- nil
 	}
 
 	// close the client connection
@@ -336,11 +341,13 @@ func (n *natsBroker) Disconnect() error {
 
 	// shutdown the local server
 	// and deregister
+	if n.server != nil {
 		select {
 		case <-n.exit:
 		default:
 			close(n.exit)
 		}
+	}
 
 	// set not connected
 	n.connected = false
@@ -439,7 +446,7 @@ func (n *natsBroker) onClose(conn *nats.Conn) {
 }
 
 func (n *natsBroker) onDisconnectedError(conn *nats.Conn, err error) {
-	n.closeCh <- nil
+	n.closeCh <- err
 }
 
 func (n *natsBroker) onAsyncError(conn *nats.Conn, sub *nats.Subscription, err error) {
@@ -460,6 +467,7 @@ func NewBroker(opts ...Option) Broker {
 
 	n := &natsBroker{
 		opts:    options,
+		closeCh: make(chan error),
 	}
 	n.setOption(opts...)
 

broker/nats/nats.go

@@ -457,7 +457,7 @@ func (n *natsBroker) onAsyncError(conn *nats.Conn, sub *nats.Subscription, err e
 }
 
 func (n *natsBroker) onDisconnectedError(conn *nats.Conn, err error) {
-	n.closeCh <- nil
+	n.closeCh <- err
 }
 
 func NewBroker(opts ...broker.Option) broker.Broker {

server/grpc/grpc.go

@@ -805,10 +805,7 @@ func (g *grpcServer) Start() error {
 			return err
 		}
 
-		baddr := config.Broker.Address()
+		log.Logf("Broker [%s] Connected to %s", config.Broker.String(), config.Broker.Address())
-		bname := config.Broker.String()
-
-		log.Logf("Broker [%s] Connected to %s", bname, baddr)
 	}
 
 	// announce self to the world
@@ -876,6 +873,7 @@ func (g *grpcServer) Start() error {
 		// close transport
 		ch <- nil
 
+		log.Logf("Broker [%s] Disconnected from %s", config.Broker.String(), config.Broker.Address())
 		// disconnect broker
 		config.Broker.Disconnect()
 	}()

server/rpc_server.go

@@ -879,6 +879,7 @@ func (s *rpcServer) Start() error {
 		// close transport listener
 		ch <- ts.Close()
 
+		log.Logf("Broker [%s] Disconnected from %s", bname, config.Broker.Address())
 		// disconnect the broker
 		config.Broker.Disconnect()