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

Removing port override as it is not needed

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

36
realis.go
View file

@ -26,6 +26,7 @@ import (
"net/http/cookiejar"
"os"
"path/filepath"
"strings"
"time"
"sync"
@ -102,6 +103,7 @@ type RealisConfig struct {
clientkey, clientcert string
options []ClientOption
debug bool
zkOptions []ZKOpt
}
var defaultBackoff = Backoff{
@ -140,8 +142,15 @@ func ZKCluster(cluster *Cluster) ClientOption {
}
func ZKUrl(url string) ClientOption {
opts := []ZKOpt{ZKEndpoints(strings.Split(url, ",")...), ZKPath("/aurora/scheduler")}
return func(config *RealisConfig) {
config.cluster = GetDefaultClusterFromZKUrl(url)
if config.zkOptions == nil {
config.zkOptions = opts
} else {
config.zkOptions = append(config.zkOptions, opts...)
}
}
}
@ -187,6 +196,16 @@ func ClientCerts(clientKey, clientCert string) ClientOption {
}
}
// Use this option if you'd like to override default settings for connecting to Zookeeper.
// For example, this can be used to override the port on which to communicate with Aurora.
// This may be helpful if Aurora is behind another service and running on a port that is different
// what is advertised in Zookeeper.
func ZookeeperOptions(opts ...ZKOpt) ClientOption {
return func(config *RealisConfig) {
config.zkOptions = opts
}
}
// Using the word set to avoid name collision with Interface.
func SetLogger(l Logger) ClientOption {
return func(config *RealisConfig) {
@ -257,9 +276,16 @@ func NewRealisClient(options ...ClientOption) (Realis, error) {
var url string
var err error
// Determine how to get information to connect to the scheduler.
// Prioritize getting leader from ZK over using a direct URL.
if config.cluster != nil {
// Find the leader using custom Zookeeper options if options are provided
if config.zkOptions != nil {
url, err = LeaderFromZKOpts(config.zkOptions...)
if err != nil {
return nil, NewTemporaryError(errors.Wrap(err, "LeaderFromZK error"))
}
config.logger.Println("Scheduler URL from ZK: ", url)
} else if config.cluster != nil {
// Determine how to get information to connect to the scheduler.
// Prioritize getting leader from ZK over using a direct URL.
url, err = LeaderFromZK(*config.cluster)
// If ZK is configured, throw an error if the leader is unable to be determined
if err != nil {
@ -270,7 +296,7 @@ func NewRealisClient(options ...ClientOption) (Realis, error) {
url = config.url
config.logger.Println("Scheduler URL: ", url)
} else {
return nil, errors.New("Incomplete Options -- url or cluster required")
return nil, errors.New("Incomplete Options -- url, cluster.json, or Zookeeper address required")
}
if config.jsonTransport {