Removing port override as it is not needed

This commit is contained in:
Renan DelValle 2018-04-12 15:12:36 -07:00
parent 70dfb02169
commit 0dec820951
No known key found for this signature in database
GPG key ID: C240AD6D6F443EC9
3 changed files with 53 additions and 12 deletions

26
zk.go
View file

@ -36,11 +36,12 @@ type ServiceInstance struct {
}
type zkConfig struct {
endpoints []string
path string
backoff Backoff
timeout time.Duration
logger Logger
endpoints []string
path string
backoff Backoff
timeout time.Duration
logger Logger
auroraSchemeOverride *string
}
type ZKOpt func(z *zkConfig)
@ -75,6 +76,12 @@ func ZKLogger(l Logger) ZKOpt {
}
}
func ZKAuroraSchemeOverride(scheme string) ZKOpt {
return func(z *zkConfig) {
z.auroraSchemeOverride = &scheme
}
}
// Retrieves current Aurora leader from ZK.
func LeaderFromZK(cluster Cluster) (string, error) {
return LeaderFromZKOpts(ZKEndpoints(strings.Split(cluster.ZK, ",")...), ZKPath(cluster.SchedZKPath))
@ -151,8 +158,15 @@ func LeaderFromZKOpts(options ...ZKOpt) (string, error) {
var scheme, host, port string
for k, v := range serviceInst.AdditionalEndpoints {
scheme = k
if config.auroraSchemeOverride == nil {
scheme = k
} else {
scheme = *config.auroraSchemeOverride
}
host = v.Host
port = strconv.Itoa(v.Port)
}