realisconfig refactor

This commit is contained in:
Kumar Krishna 2017-03-31 10:48:36 -07:00
parent 64dcf55be4
commit 48ca520eaa
2 changed files with 10 additions and 10 deletions

View file

@ -66,8 +66,8 @@ func main() {
var r realis.Realis
var defaultBackoff = &realis.Backoff{
Steps: 5,
Duration: 5 * time.Second,
Steps: 2,
Duration: 10 * time.Second,
Factor: 2.0,
Jitter: 0.1,
}
@ -84,16 +84,12 @@ func main() {
}
fmt.Printf("cluster: %+v \n", cluster)
r, err = realis.NewRealisClient(realis.ZKCluster(cluster), realis.BasicAuth(*username, *password), realis.ThriftJSON(), realis.TimeoutMS(15000))
//r, err = realis.NewRealisClient(realis.ZKCluster(cluster), realis.BasicAuth(*username, *password), realis.ThriftJSON(), realis.TimeoutMS(15000))
r, err = realis.NewRealisClient(realis.ZKUrl(*zkUrl), realis.BasicAuth(*username, *password), realis.ThriftJSON(), realis.TimeoutMS(15000), realis.BackOff(defaultBackoff))
if err != nil {
fmt.Println(err)
os.Exit(1)
}
//r, err = realis.NewDefaultClientUsingCluster(cluster, *username, *password)
//if err != nil {
// fmt.Println(err)
// os.Exit(1)
//}
monitor = &realis.Monitor{r}
} else {

View file

@ -92,6 +92,12 @@ func ZKCluster(cluster *Cluster) option {
}
}
func ZKUrl(url string) option {
return func(config *RealisConfig) {
config.cluster = GetDefaultClusterFromZKUrl(url)
}
}
func Retries(backoff *Backoff) option {
return func(config *RealisConfig) {
config.backoff = backoff
@ -433,8 +439,6 @@ func (r *realisClient) ReestablishConn() error {
}
// Configured for basic-auth
AddBasicAuth(r.config, r.config.username, r.config.password)
//config.cluster = r.config.cluster
//r.config = config
r.client = aurora.NewAuroraSchedulerManagerClientFactory(r.config.transport, r.config.protoFactory)
r.readonlyClient = aurora.NewReadOnlySchedulerClientFactory(r.config.transport, r.config.protoFactory)
} else if r.config.url != "" && r.config.username != "" && r.config.password != "" {