ridv/gorealis
1
0
Fork 0
Code Issues Pull requests Projects Releases 23 Packages Wiki Activity Actions

Removing option to override schema and ports for information found on Zookeeper.

Browse source
This commit is contained in:
Renan DelValle 2018-06-15 14:59:22 -07:00
parent d64a91784a
commit 82ed77b7c6
No known key found for this signature in database
GPG key ID: C240AD6D6F443EC9
1 changed files with 2 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

27
zk.go
View file

@ -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. // Retrieves current Aurora leader from ZK.
func LeaderFromZK(cluster Cluster) (string, error) { func LeaderFromZK(cluster Cluster) (string, error) {
return LeaderFromZKOpts(ZKEndpoints(strings.Split(cluster.ZK, ",")...), ZKPath(cluster.SchedZKPath)) 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 var scheme, host, port string
for k, v := range serviceInst.AdditionalEndpoints { for k, v := range serviceInst.AdditionalEndpoints {
scheme = k
if config.auroraSchemeOverride == nil {
scheme = k
} else {
scheme = *config.auroraSchemeOverride
}
host = v.Host host = v.Host
port = strconv.Itoa(v.Port)
if config.auroraPortOverride == nil {
port = strconv.Itoa(v.Port)
} else {
port = strconv.Itoa(*config.auroraPortOverride)
}
} }
leaderURL = scheme + "://" + host + ":" + port leaderURL = scheme + "://" + host + ":" + port