From 82ed77b7c6d8f0bd9549b11fa89c193683ef5cbd Mon Sep 17 00:00:00 2001 From: Renan DelValle Date: Fri, 15 Jun 2018 14:59:22 -0700 Subject: [PATCH] Removing option to override schema and ports for information found on Zookeeper. --- zk.go | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/zk.go b/zk.go index f930bd9..34ad1a7 100644 --- a/zk.go +++ b/zk.go @@ -77,18 +77,6 @@ func ZKLogger(l Logger) ZKOpt { } } -func ZKAuroraSchemeOverride(scheme string) ZKOpt { - return func(z *zkConfig) { - z.auroraSchemeOverride = &scheme - } -} - -func ZKAuroraPortOverride(port int) ZKOpt { - return func(z *zkConfig) { - z.auroraPortOverride = &port - } -} - // Retrieves current Aurora leader from ZK. func LeaderFromZK(cluster Cluster) (string, error) { return LeaderFromZKOpts(ZKEndpoints(strings.Split(cluster.ZK, ",")...), ZKPath(cluster.SchedZKPath)) @@ -165,20 +153,9 @@ func LeaderFromZKOpts(options ...ZKOpt) (string, error) { var scheme, host, port string for k, v := range serviceInst.AdditionalEndpoints { - - if config.auroraSchemeOverride == nil { - scheme = k - } else { - scheme = *config.auroraSchemeOverride - } - + scheme = k host = v.Host - - if config.auroraPortOverride == nil { - port = strconv.Itoa(v.Port) - } else { - port = strconv.Itoa(*config.auroraPortOverride) - } + port = strconv.Itoa(v.Port) } leaderURL = scheme + "://" + host + ":" + port