Merge pull request #657 from nats-io/route-port-display

kozlovic · web-flow · commit effc6b1f3f06 · 2018-03-23T17:17:48.000-06:00
[FIXED] Random cluster port displayed as 0 instead of actual value
diff --git a/server/route.go b/server/route.go
@@ -659,12 +659,13 @@ func (s *Server) routeAcceptLoop(ch chan struct{}) {
 	}
 
 	hp := net.JoinHostPort(opts.Cluster.Host, strconv.Itoa(port))
-	s.Noticef("Listening for route connections on %s", hp)
 	l, e := net.Listen("tcp", hp)
 	if e != nil {
 		s.Fatalf("Error listening on router port: %d - %v", opts.Cluster.Port, e)
 		return
 	}
+	s.Noticef("Listening for route connections on %s",
+		net.JoinHostPort(opts.Cluster.Host, strconv.Itoa(l.Addr().(*net.TCPAddr).Port)))
 
 	s.mu.Lock()
 	// Check for TLSConfig

Original file line number	Diff line number	Diff line change
`@@ -659,12 +659,13 @@ func (s *Server) routeAcceptLoop(ch chan struct{}) {`
`659`	`659`	`}`
`660`	`660`
`661`	`661`	`hp := net.JoinHostPort(opts.Cluster.Host, strconv.Itoa(port))`
`662`		`- s.Noticef("Listening for route connections on %s", hp)`
`663`	`662`	`l, e := net.Listen("tcp", hp)`
`664`	`663`	`if e != nil {`
`665`	`664`	`s.Fatalf("Error listening on router port: %d - %v", opts.Cluster.Port, e)`
`666`	`665`	`return`
`667`	`666`	`}`
	`667`	`+ s.Noticef("Listening for route connections on %s",`
	`668`	`+ net.JoinHostPort(opts.Cluster.Host, strconv.Itoa(l.Addr().(*net.TCPAddr).Port)))`
`668`	`669`
`669`	`670`	`s.mu.Lock()`
`670`	`671`	`// Check for TLSConfig`