luxolus/open-nomad
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

fixing the logic of addr resolution

Browse source
This commit is contained in:
Diptanu Choudhury 2016-02-16 13:13:40 -08:00
parent ba0dc9bca9
commit 0e7a2d68c1
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
command/agent/agent.go
View file

@ -227,11 +227,10 @@ func (a *Agent) setupClient() error {
conf.Node.NodeClass = a.config.Client.NodeClass
httpAddr := fmt.Sprintf("%s:%d", a.config.BindAddr, a.config.Ports.HTTP)
if a.config.Addresses.HTTP != "" && a.config.AdvertiseAddrs.HTTP == "" {
addr, err := net.ResolveTCPAddr("tcp", a.config.Addresses.HTTP)
if err != nil {
httpAddr = fmt.Sprintf("%s:%d", a.config.Addresses.HTTP, a.config.Ports.HTTP)
if _, err := net.ResolveTCPAddr("tcp", httpAddr); err != nil {
return fmt.Errorf("error resolving http addr: %v:", err)
}
httpAddr = fmt.Sprintf("%s:%d", addr.IP.String(), addr.Port)
} else if a.config.AdvertiseAddrs.HTTP != "" {
addr, err := net.ResolveTCPAddr("tcp", a.config.AdvertiseAddrs.HTTP)
if err != nil {