unistack-org/micro
4
0
Fork 2
Code Issues 18 Pull Requests Actions Packages Projects Releases 331 Wiki Activity

Merge pull request #814 from milosgajdos83/etcd-port

Browse Source 
Append a port to address if it does not exist
This commit is contained in:
Asim Aslam
2019-10-03 16:20:43 +01:00
committed by GitHub
parent b1163b9dee b8815dff14
commit 0941a0f031
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
registry/consul/consul.go
View File

@@ -107,9 +107,9 @@ func configure(c *consulRegistry, opts ...registry.Option) {
if ae, ok := err.(*net.AddrError); ok && ae.Err == "missing port in address" { if ae, ok := err.(*net.AddrError); ok && ae.Err == "missing port in address" {
port = "8500" port = "8500"
addr = address addr = address
addrs = append(addrs, fmt.Sprintf("%s:%s", addr, port)) addrs = append(addrs, net.JoinHostPort(addr, port))
} else if err == nil { } else if err == nil {
addrs = append(addrs, fmt.Sprintf("%s:%s", addr, port)) addrs = append(addrs, net.JoinHostPort(addr, port))
} }
} }

14
registry/etcd/etcd.go
View File

@@ -6,6 +6,7 @@ import (
"crypto/tls" "crypto/tls"
"encoding/json" "encoding/json"
"errors" "errors"
"net"
"path" "path"
"strings" "strings"
"sync" "sync"
@@ -74,11 +75,18 @@ func configure(e *etcdRegistry, opts ...registry.Option) error {
var cAddrs []string var cAddrs []string
for _, addr := range e.options.Addrs { for _, address := range e.options.Addrs {
if len(addr) == 0 { if len(address) == 0 {
continue continue
} }
cAddrs = append(cAddrs, addr) addr, port, err := net.SplitHostPort(address)
if ae, ok := err.(*net.AddrError); ok && ae.Err == "missing port in address" {
port = "2379"
addr = address
cAddrs = append(cAddrs, net.JoinHostPort(addr, port))
} else if err == nil {
cAddrs = append(cAddrs, net.JoinHostPort(addr, port))
}
} }
// if we got addrs then we'll update // if we got addrs then we'll update