diff --git a/docs/toml.md b/docs/toml.md index 1b77deae8..6c75022a7 100644 --- a/docs/toml.md +++ b/docs/toml.md @@ -9,10 +9,10 @@ # Global configuration ################################################################ -# Duration to give active requests a chance to finish during hot-reloads. -# Can be provided in a format supported by [time.ParseDuration](https://golang.org/pkg/time/#ParseDuration) or as raw -# values (digits). If no units are provided, the value is parsed assuming -# seconds. +# Duration to give active requests a chance to finish before Traefik stops. +# Can be provided in a format supported by [time.ParseDuration](https://golang.org/pkg/time/#ParseDuration) or as raw values (digits). +# If no units are provided, the value is parsed assuming seconds. +# Note: in this time frame no new requests are accepted. # # Optional # Default: "10s" diff --git a/server/configuration.go b/server/configuration.go index 7b78493b3..5a3bc0726 100644 --- a/server/configuration.go +++ b/server/configuration.go @@ -40,7 +40,7 @@ type TraefikConfiguration struct { // GlobalConfiguration holds global configuration (with providers, etc.). // It's populated from the traefik configuration file passed as an argument to the binary. type GlobalConfiguration struct { - GraceTimeOut flaeg.Duration `short:"g" description:"Duration to give active requests a chance to finish during hot-reload"` + GraceTimeOut flaeg.Duration `short:"g" description:"Duration to give active requests a chance to finish before Traefik stops"` Debug bool `short:"d" description:"Enable debug mode"` CheckNewVersion bool `description:"Periodically check if a new version has been released"` AccessLogsFile string `description:"(Deprecated) Access logs file"` // Deprecated diff --git a/traefik.sample.toml b/traefik.sample.toml index f02d6066b..b9ed3c33a 100644 --- a/traefik.sample.toml +++ b/traefik.sample.toml @@ -2,10 +2,10 @@ # Global configuration ################################################################ -# Duration to give active requests a chance to finish during hot-reloads. -# Can be provided in a format supported by Go's time.ParseDuration function or -# as raw values (digits). If no units are provided, the value is parsed assuming -# seconds. +# Duration to give active requests a chance to finish before Traefik stops. +# Can be provided in a format supported by [time.ParseDuration](https://golang.org/pkg/time/#ParseDuration) or as raw values (digits). +# If no units are provided, the value is parsed assuming seconds. +# Note: in this time frame no new requests are accepted. # # Optional # Default: "10s"