status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

agent: Fixing wrong port usage for server

This commit is contained in:
Armon Dadgar 2014-04-14 12:37:49 -07:00
parent fac359b4bf
commit d8ca1f367c
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
command/agent/agent.go
View File

@ -148,15 +148,18 @@ func (a *Agent) consulConfig() *consul.Config {
base.SerfWANConfig.MemberlistConfig.AdvertisePort = a.config.Ports.SerfWan base.SerfWANConfig.MemberlistConfig.AdvertisePort = a.config.Ports.SerfWan
} }
if a.config.BindAddr != "" { if a.config.BindAddr != "" {
addr, _ := net.ResolveTCPAddr("tcp", a.config.BindAddr) bindAddr := &net.TCPAddr{
base.RPCAddr = addr IP: net.ParseIP(a.config.BindAddr),
Port: a.config.Ports.Server,
}
base.RPCAddr = bindAddr
} }
if a.config.AdvertiseAddr != "" { if a.config.AdvertiseAddr != "" {
base.SerfLANConfig.MemberlistConfig.AdvertiseAddr = a.config.AdvertiseAddr base.SerfLANConfig.MemberlistConfig.AdvertiseAddr = a.config.AdvertiseAddr
base.SerfWANConfig.MemberlistConfig.AdvertiseAddr = a.config.AdvertiseAddr base.SerfWANConfig.MemberlistConfig.AdvertiseAddr = a.config.AdvertiseAddr
base.RPCAdvertise = &net.TCPAddr{ base.RPCAdvertise = &net.TCPAddr{
IP: net.ParseIP(a.config.AdvertiseAddr), IP: net.ParseIP(a.config.AdvertiseAddr),
Port: a.config.Ports.RPC, Port: a.config.Ports.Server,
} }
} }
if a.config.Bootstrap { if a.config.Bootstrap {