gogrlx/nats-server
1
0
Fork 0
mirror of https://github.com/gogrlx/nats-server.git synced 2026-04-17 03:24:40 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix scheme for routes returned

Browse Source 
When server returns routes through INFO, use "nats-route://" scheme.
A test was checking that.
Add test to check that hostname is replaced with IP.
This commit is contained in:
Ivan Kozlovic
2016-02-11 17:20:33 -07:00
parent fc38a8336f
commit ce79f524be
2 changed files with 87 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
server/route.go
View File

@@ -216,18 +216,22 @@ func (s *Server) createRoute(conn net.Conn, rURL *url.URL) *client {
info := s.routeInfo
for _, r := range s.routes {
r.mu.Lock()
if r.route.url != nil {
// race condition where connection can be closed (r.nc == nil)
// and route still in s.routes[].
if r.nc == nil {
r.mu.Unlock()
continue
}
if r.route.url != nil {
var rurl string
if r.nc != nil {
_, rport, err := net.SplitHostPort(r.route.url.Host)
if err == nil {
// We will send the url but based on the route's ip address.
if ip, ok := r.nc.(*net.TCPConn); ok {
addr := ip.RemoteAddr().(*net.TCPAddr)
rurl = fmt.Sprintf("nats://%s:%s", addr.IP.String(), rport)
}
_, rport, err := net.SplitHostPort(r.route.url.Host)
if err == nil {
// We will send the url but based on the route's ip address.
if ip, ok := r.nc.(*net.TCPConn); ok {
addr := ip.RemoteAddr().(*net.TCPAddr)
rurl = fmt.Sprintf("nats-route://%s:%s/", addr.IP.String(), rport)
}
}