Skip to content

Commit

Permalink
fixed type in pollinterval config
Browse files Browse the repository at this point in the history
  • Loading branch information
galen0624 committed Jan 29, 2020
1 parent 184bdb6 commit f9cbf14
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions config/load.go
Original file line number Diff line number Diff line change
Expand Up @@ -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]")
Expand All @@ -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")

Expand Down
4 changes: 2 additions & 2 deletions config/load_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions docs/content/ref/registry.custom.pollinginterval.md
Original file line number Diff line number Diff line change
@@ -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
registry.custom.pollinterval = 10s
4 changes: 2 additions & 2 deletions fabio.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit f9cbf14

Please sign in to comment.