diff --git a/config/load.go b/config/load.go index 2bd6d6bd7..cccef573b 100644 --- a/config/load.go +++ b/config/load.go @@ -191,7 +191,7 @@ func load(cmdline, environ, envprefix []string, props *properties.Properties) (c f.StringVar(&obsoleteStr, "registry.consul.register.checkDeregisterCriticalServiceAfter", "", "This option is deprecated and has no effect.") f.StringVar(&cfg.Registry.Consul.ChecksRequired, "registry.consul.checksRequired", defaultConfig.Registry.Consul.ChecksRequired, "number of checks which must pass: one or all") f.IntVar(&cfg.Registry.Consul.ServiceMonitors, "registry.consul.serviceMonitors", defaultConfig.Registry.Consul.ServiceMonitors, "concurrency for route updates") - f.DurationVar(&cfg.Registry.Consul.PollInterval, "registry.consul.pollInterval", defaultConfig.Registry.Consul.PollInterval, "poll interval for route updates") + f.DurationVar(&cfg.Registry.Consul.PollInterval, "registry.consul.pollinterval", defaultConfig.Registry.Consul.PollInterval, "poll interval for route updates") f.IntVar(&cfg.Runtime.GOGC, "runtime.gogc", defaultConfig.Runtime.GOGC, "sets runtime.GOGC") f.IntVar(&cfg.Runtime.GOMAXPROCS, "runtime.gomaxprocs", defaultConfig.Runtime.GOMAXPROCS, "sets runtime.GOMAXPROCS") f.StringVar(&cfg.UI.Access, "ui.access", defaultConfig.UI.Access, "access mode, one of [ro, rw]") @@ -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.PollInterval, "registry.custom.pollinginterval", defaultConfig.Registry.Custom.PollInterval, "polling interval for API request to custom back end") + f.DurationVar(&cfg.Registry.Custom.PollInterval, "registry.custom.pollinterval", defaultConfig.Registry.Custom.PollInterval, "poll 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") diff --git a/config/load_test.go b/config/load_test.go index dd0da64ce..a25fa4f17 100644 --- a/config/load_test.go +++ b/config/load_test.go @@ -704,7 +704,7 @@ func TestLoad(t *testing.T) { }, }, { - args: []string{"-registry.custom.pollinginterval", "5s"}, + args: []string{"-registry.custom.pollinterval", "5s"}, cfg: func(cfg *Config) *Config { cfg.Registry.Custom.PollInterval = 5 * time.Second return cfg @@ -725,7 +725,7 @@ func TestLoad(t *testing.T) { }, }, { - args: []string{"-registry.consul.register.pollinterval", "5s"}, + args: []string{"-registry.consul.pollinterval", "5s"}, cfg: func(cfg *Config) *Config { cfg.Registry.Consul.PollInterval = 5 * time.Second return cfg diff --git a/docs/content/ref/registry.custom.pollinginterval.md b/docs/content/ref/registry.custom.pollinginterval.md index 39099dbe4..17fc8173a 100644 --- a/docs/content/ref/registry.custom.pollinginterval.md +++ b/docs/content/ref/registry.custom.pollinginterval.md @@ -1,9 +1,9 @@ --- -title: "registry.custom.pollinginterval" +title: "registry.custom.pollinterval" --- -`registry.custom.pollinginterval` is the length of time between API calls +`registry.custom.pollinterval` is the length of time between API calls The default is - registry.custom.pollinginterval = 10s \ No newline at end of file + registry.custom.pollinterval = 10s \ No newline at end of file diff --git a/fabio.properties b/fabio.properties index 4c32329cf..cd7f99795 100644 --- a/fabio.properties +++ b/fabio.properties @@ -928,11 +928,11 @@ # registry.custom.timeout = 5s -# registry.custom.pollinginterval is the length of time between API calls +# registry.custom.pollinterval is the length of time between API calls # # The default is # -#registry.custom.pollinginterval = 10s +#registry.custom.pollinterval = 10s # registry.custom.path is the path used in the custom back end API Call