status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-01-11 14:24:39 +00:00
Code Issues Projects Releases Wiki Activity

Tweaks error handling case to not panic further down.

Browse Source
This commit is contained in:
James Phillips 2017-04-12 10:02:42 -07:00
parent d38ceaa3ea
commit 1ec16b9243
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 { if port, ok := portFn(server); ok {
addr = net.JoinHostPort(addr, fmt.Sprintf("%d", port)) addr = net.JoinHostPort(addr, fmt.Sprintf("%d", port))
} else { } else {
// globalSerf.Join expects bracketed ipv6 addresses // If we have an IPv6 address, we should add brackets,
ip := net.ParseIP(addr) // single globalSerf.Join expects that.
if ip == nil { if ip := net.ParseIP(addr); ip != nil {
// should never happen if ip.To4() == nil {
addr = fmt.Sprintf("[%s]", addr)
}
} else {
logger.Printf("[DEBUG] consul: Failed to parse IP %s", addr) 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! // Do the join!