rebase to master

config/config.go

@@ -155,7 +155,7 @@ type Consul struct {
 	ChecksRequired     string
 	ServiceMonitors    int
 	TLS                ConsulTlS
-	PollingInterval    time.Duration
+	PollInterval       time.Duration
 }
 
 type Custom struct {
@@ -164,7 +164,7 @@ type Custom struct {
 	QueryParams        string
 	Scheme             string
 	CheckTLSSkipVerify bool
-	PollingInterval    time.Duration
+	PollInterval       time.Duration
 	NoRouteHTML        string
 	Timeout            time.Duration
 }

config/default.go

@@ -65,13 +65,13 @@ var defaultConfig = &Config{
 			CheckTimeout:    3 * time.Second,
 			CheckScheme:     "http",
 			ChecksRequired:  "one",
-			PollingInterval: 0,
+			PollInterval:    0,
 		},
 		Custom: Custom{
 			Host:               "",
 			Scheme:             "https",
 			CheckTLSSkipVerify: false,
-			PollingInterval:    5,
+			PollInterval:       5,
 			NoRouteHTML:        "",
 			Timeout:            10,
 			Path:               "",

config/load.go

@@ -215,7 +215,7 @@ func load(cmdline, environ, envprefix []string, props *properties.Properties) (c
 	f.StringVar(&cfg.Registry.Custom.NoRouteHTML, "registry.custom.noroutehtml", defaultConfig.Registry.Custom.NoRouteHTML, "path to file for HTML returned when no route is found")
 	f.BoolVar(&cfg.Registry.Custom.CheckTLSSkipVerify, "registry.custom.checkTLSSkipVerify", defaultConfig.Registry.Custom.CheckTLSSkipVerify, "custom back end check TLS verification")
 	f.DurationVar(&cfg.Registry.Custom.Timeout, "registry.custom.timeout", defaultConfig.Registry.Custom.Timeout, "timeout for API request to custom back end")
-	f.DurationVar(&cfg.Registry.Custom.PollingInterval, "registry.custom.pollinginterval", defaultConfig.Registry.Custom.PollingInterval, "polling interval for API request to custom back end")
+	f.DurationVar(&cfg.Registry.Custom.PollInterval, "registry.custom.pollinginterval", defaultConfig.Registry.Custom.PollInterval, "polling interval for API request to custom back end")
 	f.StringVar(&cfg.Registry.Custom.Path, "registry.custom.path", defaultConfig.Registry.Custom.Path, "custom back end path in the URL")
 	f.StringVar(&cfg.Registry.Custom.QueryParams, "registry.custom.queryparams", defaultConfig.Registry.Custom.QueryParams, "custom back end query parameters in the URL")
 

config/load_test.go

@@ -706,7 +706,7 @@ func TestLoad(t *testing.T) {
 		{
 			args: []string{"-registry.custom.pollinginterval", "5s"},
 			cfg: func(cfg *Config) *Config {
-				cfg.Registry.Custom.PollingInterval = 5 * time.Second
+				cfg.Registry.Custom.PollInterval = 5 * time.Second
 				return cfg
 			},
 		},
@@ -724,13 +724,13 @@ func TestLoad(t *testing.T) {
 				return cfg
 			},
 		},
-			{
+		{
 			args: []string{"-registry.consul.register.pollinterval", "5s"},
-				cfg: func(cfg *Config) *Config {
-					cfg.Registry.Consul.PollingInterval = 5 * time.Second
-					return cfg
-				},
+			cfg: func(cfg *Config) *Config {
+				cfg.Registry.Consul.PollInterval = 5 * time.Second
+				return cfg
 			},
+		},
 		{
 			args: []string{"-log.access.format", "foobar"},
 			cfg: func(cfg *Config) *Config {

registry/consul/routecmd.go

@@ -33,7 +33,6 @@ func (r routecmd) build() []string {
 		}
 	}
 
-
 	// generate route commands
 	var config []string
 	for _, tag := range routetags {

registry/consul/service.go

@@ -139,4 +139,4 @@ func (w *ServiceMonitor) serviceConfig(name string, passing map[string]bool) (co
 		config = append(config, cmds...)
 	}
 	return config
-}
+}

registry/custom/custom.go

@@ -48,21 +48,21 @@ func customRoutes(cfg *config.Custom, ch chan string) {
 		resp, err := client.Do(req)
 		if err != nil {
 			ch <- fmt.Sprintf("Error Sending HTTPs Request To Custom be - %s -%s", URL, err.Error())
-			time.Sleep(cfg.PollingInterval)
+			time.Sleep(cfg.PollInterval)
 			continue
 		}
 
 		if resp.StatusCode != 200 {
 			ch <- fmt.Sprintf("Error Non-200 return (%v) from  -%s", resp.StatusCode, URL)
-			time.Sleep(cfg.PollingInterval)
+			time.Sleep(cfg.PollInterval)
 			continue
 		}
 		log.Printf("[DEBUG] Custom Registry begin decoding json %s \n", time.Now())
 		decoder := json.NewDecoder(resp.Body)
 		err = decoder.Decode(&Routes)
 		if err != nil {
 			ch <- fmt.Sprintf("Error decoding request - %s -%s", URL, err.Error())
-			time.Sleep(cfg.PollingInterval)
+			time.Sleep(cfg.PollInterval)
 			continue
 		}
 
@@ -75,7 +75,7 @@ func customRoutes(cfg *config.Custom, ch chan string) {
 		route.SetTable(t)
 		log.Printf("[DEBUG] Custom Registry table set complete %s \n", time.Now())
 		ch <- "OK"
-		time.Sleep(cfg.PollingInterval)
+		time.Sleep(cfg.PollInterval)
 
 	}
 

registry/custom/custom_test.go

@@ -18,7 +18,7 @@ func TestCustomRoutes(t *testing.T) {
 		Path:               "test",
 		Scheme:             "http",
 		CheckTLSSkipVerify: false,
-		PollingInterval:    3 * time.Second,
+		PollInterval:       3 * time.Second,
 		Timeout:            3 * time.Second,
 	}
 

route/table.go

@@ -363,7 +363,7 @@ func (t Table) matchingHostNoGlob(req *http.Request) (hosts []string) {
 
 	for pattern := range t {
 		normpat := normalizeHost(pattern, req.TLS != nil)
-		if  normpat == host {
+		if normpat == host {
 			hosts = append(hosts, strings.ToLower(pattern))
 			return
 		}