From 48ca520eaa6f913b3642247e7f73fbc8a86756f8 Mon Sep 17 00:00:00 2001 From: Kumar Krishna Date: Fri, 31 Mar 2017 10:48:36 -0700 Subject: [PATCH] realisconfig refactor --- examples/client.go | 12 ++++-------- realis.go | 8 ++++++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/examples/client.go b/examples/client.go index 357886b..078ff8c 100644 --- a/examples/client.go +++ b/examples/client.go @@ -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 { diff --git a/realis.go b/realis.go index 0e47340..ac78408 100644 --- a/realis.go +++ b/realis.go @@ -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 != "" {