From d3555053d098690736ef6494a9c8300035007dbe Mon Sep 17 00:00:00 2001 From: Ivan Kozlovic Date: Thu, 22 Dec 2016 14:59:27 -0700 Subject: [PATCH] Change option/parameter name --- main.go | 4 ++-- server/configs/cluster.conf | 2 +- server/opts.go | 28 ++++++++++++++-------------- server/opts_test.go | 8 ++++---- server/route.go | 4 ++-- server/routes_test.go | 14 +++++++------- test/route_discovery_test.go | 2 +- 7 files changed, 31 insertions(+), 31 deletions(-) diff --git a/main.go b/main.go index 2165c1dd..6a1c1a36 100644 --- a/main.go +++ b/main.go @@ -50,7 +50,7 @@ Cluster Options: --routes Routes to solicit and connect --cluster Cluster URL for solicited routes --no_advertise Advertise known cluster IPs to clients - --conn_retries For implicit routes, number of connect retries + --connect_retries For implicit routes, number of connect retries Common Options: @@ -111,7 +111,7 @@ func main() { flag.StringVar(&opts.Cluster.ListenStr, "cluster", "", "Cluster url from which members can solicit routes.") flag.StringVar(&opts.Cluster.ListenStr, "cluster_listen", "", "Cluster url from which members can solicit routes.") flag.BoolVar(&opts.Cluster.NoAdvertise, "no_advertise", false, "Advertise known cluster IPs to clients.") - flag.IntVar(&opts.Cluster.ConnRetries, "conn_retries", 0, "For implicit routes, number of connect retries") + flag.IntVar(&opts.Cluster.ConnectRetries, "connect_retries", 0, "For implicit routes, number of connect retries") flag.BoolVar(&showTLSHelp, "help_tls", false, "TLS help.") flag.BoolVar(&opts.TLS, "tls", false, "Enable TLS.") flag.BoolVar(&opts.TLSVerify, "tlsverify", false, "Enable TLS with client verification.") diff --git a/server/configs/cluster.conf b/server/configs/cluster.conf index b05a6112..cc134fef 100644 --- a/server/configs/cluster.conf +++ b/server/configs/cluster.conf @@ -33,5 +33,5 @@ cluster { ] no_advertise: true - conn_retries: 2 + connect_retries: 2 } diff --git a/server/opts.go b/server/opts.go index f012a84d..a02962cd 100644 --- a/server/opts.go +++ b/server/opts.go @@ -33,16 +33,16 @@ type Permissions struct { // Options for clusters. type ClusterOpts struct { - Host string `json:"addr"` - Port int `json:"cluster_port"` - Username string `json:"-"` - Password string `json:"-"` - AuthTimeout float64 `json:"auth_timeout"` - TLSTimeout float64 `json:"-"` - TLSConfig *tls.Config `json:"-"` - ListenStr string `json:"-"` - NoAdvertise bool `json:"-"` - ConnRetries int `json:"-"` + Host string `json:"addr"` + Port int `json:"cluster_port"` + Username string `json:"-"` + Password string `json:"-"` + AuthTimeout float64 `json:"auth_timeout"` + TLSTimeout float64 `json:"-"` + TLSConfig *tls.Config `json:"-"` + ListenStr string `json:"-"` + NoAdvertise bool `json:"-"` + ConnectRetries int `json:"-"` } // Options block for gnatsd server. @@ -315,8 +315,8 @@ func parseCluster(cm map[string]interface{}, opts *Options) error { opts.Cluster.TLSTimeout = tc.Timeout case "no_advertise": opts.Cluster.NoAdvertise = mv.(bool) - case "conn_retries": - opts.Cluster.ConnRetries = int(mv.(int64)) + case "connect_retries": + opts.Cluster.ConnectRetries = int(mv.(int64)) } } return nil @@ -650,8 +650,8 @@ func MergeOptions(fileOpts, flagOpts *Options) *Options { if flagOpts.Cluster.NoAdvertise { opts.Cluster.NoAdvertise = true } - if flagOpts.Cluster.ConnRetries != 0 { - opts.Cluster.ConnRetries = flagOpts.Cluster.ConnRetries + if flagOpts.Cluster.ConnectRetries != 0 { + opts.Cluster.ConnectRetries = flagOpts.Cluster.ConnectRetries } if flagOpts.RoutesStr != "" { mergeRoutes(&opts, flagOpts) diff --git a/server/opts_test.go b/server/opts_test.go index 508f3a55..a8302ef0 100644 --- a/server/opts_test.go +++ b/server/opts_test.go @@ -191,8 +191,8 @@ func TestMergeOverrides(t *testing.T) { PingInterval: 60 * time.Second, MaxPingsOut: 3, Cluster: ClusterOpts{ - NoAdvertise: true, - ConnRetries: 2, + NoAdvertise: true, + ConnectRetries: 2, }, } fopts, err := ProcessConfigFile("./configs/test.conf") @@ -208,8 +208,8 @@ func TestMergeOverrides(t *testing.T) { HTTPPort: DEFAULT_HTTP_PORT, ProfPort: 6789, Cluster: ClusterOpts{ - NoAdvertise: true, - ConnRetries: 2, + NoAdvertise: true, + ConnectRetries: 2, }, } merged := MergeOptions(fopts, opts) diff --git a/server/route.go b/server/route.go index b55ffe0b..6e004bc1 100644 --- a/server/route.go +++ b/server/route.go @@ -696,11 +696,11 @@ func (s *Server) connectToRoute(rURL *url.URL, tryForEver bool) { if err != nil { Debugf("Error trying to connect to route: %v", err) if !tryForEver { - if s.opts.Cluster.ConnRetries <= 0 { + if s.opts.Cluster.ConnectRetries <= 0 { return } attempts++ - if attempts > s.opts.Cluster.ConnRetries { + if attempts > s.opts.Cluster.ConnectRetries { return } } diff --git a/server/routes_test.go b/server/routes_test.go index 6a16542a..e0f5f90d 100644 --- a/server/routes_test.go +++ b/server/routes_test.go @@ -27,13 +27,13 @@ func TestRouteConfig(t *testing.T) { Password: "bella", AuthTimeout: 1.0, Cluster: ClusterOpts{ - Host: "127.0.0.1", - Port: 4244, - Username: "route_user", - Password: "top_secret", - AuthTimeout: 1.0, - NoAdvertise: true, - ConnRetries: 2, + Host: "127.0.0.1", + Port: 4244, + Username: "route_user", + Password: "top_secret", + AuthTimeout: 1.0, + NoAdvertise: true, + ConnectRetries: 2, }, LogFile: "/tmp/nats_cluster_test.log", PidFile: "/tmp/nats_cluster_test.pid", diff --git a/test/route_discovery_test.go b/test/route_discovery_test.go index 8197a638..5d33bd1d 100644 --- a/test/route_discovery_test.go +++ b/test/route_discovery_test.go @@ -646,7 +646,7 @@ func TestImplicitRouteRetry(t *testing.T) { optsA := nextServerOpts(optsSeed) optsA.Routes = server.RoutesFromStr(fmt.Sprintf("nats://%s:%d", optsSeed.Cluster.Host, optsSeed.Cluster.Port)) - optsA.Cluster.ConnRetries = 5 + optsA.Cluster.ConnectRetries = 5 srvA := RunServer(optsA) defer srvA.Shutdown()