luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Tweaks error handling case to not panic further down.

This commit is contained in:
James Phillips 2017-04-12 10:02:42 -07:00
parent 7c8f25c36e
commit 5b35ee3866
No known key found for this signature in database
GPG Key ID: 77183E682AC5FC11
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
consul/servers/serf_flooder.go
View File

@ -70,16 +70,15 @@ func FloodJoins(logger *log.Logger, portFn FloodPortFn,
if port, ok := portFn(server); ok {
addr = net.JoinHostPort(addr, fmt.Sprintf("%d", port))
} else {
// globalSerf.Join expects bracketed ipv6 addresses
ip := net.ParseIP(addr)
if ip == nil {
// should never happen
// If we have an IPv6 address, we should add brackets,
// single globalSerf.Join expects that.
if ip := net.ParseIP(addr); ip != nil {
if ip.To4() == nil {
addr = fmt.Sprintf("[%s]", addr)
}
} else {
logger.Printf("[DEBUG] consul: Failed to parse IP %s", addr)
}
// If we have an IPv6 address, we should add brackets
if ip.To4() == nil {
addr = fmt.Sprintf("[%s]", addr)
}
}
// Do the join!