Adding port override back in.
This commit is contained in:
parent
1e1b2e48b7
commit
280db21d33
1 changed files with 12 additions and 1 deletions
13
zk.go
13
zk.go
|
@ -42,6 +42,7 @@ type zkConfig struct {
|
||||||
timeout time.Duration
|
timeout time.Duration
|
||||||
logger Logger
|
logger Logger
|
||||||
auroraSchemeOverride *string
|
auroraSchemeOverride *string
|
||||||
|
auroraPortOverride *int
|
||||||
}
|
}
|
||||||
|
|
||||||
type ZKOpt func(z *zkConfig)
|
type ZKOpt func(z *zkConfig)
|
||||||
|
@ -82,6 +83,12 @@ func ZKAuroraSchemeOverride(scheme string) ZKOpt {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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))
|
||||||
|
@ -167,7 +174,11 @@ func LeaderFromZKOpts(options ...ZKOpt) (string, error) {
|
||||||
|
|
||||||
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
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue