make the broker/transport listen on new addr when stop/started with a…

…ddr :0
ilaotan · May 25, 2018 · c666558 · c666558
1 parent 6444b7e
commit c666558
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/broker/http_broker.go b/broker/http_broker.go
@@ -326,10 +326,16 @@ func (h *httpBroker) Connect() error {
 	}
 
 	log.Logf("Broker Listening on %s", l.Addr().String())
+	addr := h.address
 	h.address = l.Addr().String()
 
 	go http.Serve(l, h.mux)
-	go h.run(l)
+	go func() {
+		h.run(l)
+		h.Lock()
+		h.address = addr
+		h.Unlock()
+	}()
 
 	// get registry
 	reg, ok := h.opts.Context.Value(registryKey).(registry.Registry)

diff --git a/server/rpc_server.go b/server/rpc_server.go
@@ -386,6 +386,8 @@ func (s *rpcServer) Start() error {
 
 	log.Logf("Listening on %s", ts.Addr())
 	s.Lock()
+	// swap address
+	addr := s.opts.Address
 	s.opts.Address = ts.Addr()
 	s.Unlock()
 
@@ -405,6 +407,11 @@ func (s *rpcServer) Start() error {
 
 		// disconnect the broker
 		config.Broker.Disconnect()
+
+		s.Lock()
+		// swap back address
+		s.opts.Address = addr
+		s.Unlock()
 	}()
 
 	// TODO: subscribe to cruft