Rename reqAcceptGraceTimeOut to requestAcceptGraceTimeout.

traefik · Sep 26, 2017 · dd1a108 · dd1a108
1 parent 8f84490
commit dd1a108
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/configuration/configuration.go b/configuration/configuration.go
@@ -502,6 +502,6 @@ type ForwardingTimeouts struct {
 // LifeCycle contains configurations relevant to the lifecycle (such as the
 // shutdown phase) of Traefik.
 type LifeCycle struct {
-	ReqAcceptGraceTimeOut flaeg.Duration `description:"Duration to keep accepting requests before Traefik initiates the graceful shutdown procedure"`
-	GraceTimeOut          flaeg.Duration `description:"Duration to give active requests a chance to finish before Traefik stops"`
+	RequestAcceptGraceTimeout flaeg.Duration `description:"Duration to keep accepting requests before Traefik initiates the graceful shutdown procedure"`
+	GraceTimeOut              flaeg.Duration `description:"Duration to give active requests a chance to finish before Traefik stops"`
 }
diff --git a/docs/configuration/commons.md b/docs/configuration/commons.md
@@ -328,7 +328,7 @@ Controls the behavior of Traefik during the shutdown phase.
 # Optional
 # Default: 0
 #
-# reqAcceptGraceTimeOut = "10s"
+# requestAcceptGraceTimeout = "10s"
 
 # 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).

diff --git a/integration/basic_test.go b/integration/basic_test.go
@@ -104,7 +104,7 @@ func (s *SimpleSuite) TestPrintHelp(c *check.C) {
 	c.Assert(err, checker.IsNil)
 }
 
-func (s *SimpleSuite) TestReqAcceptGraceTimeout(c *check.C) {
+func (s *SimpleSuite) TestRequestAcceptGraceTimeout(c *check.C) {
 	s.createComposeProject(c, "reqacceptgrace")
 	s.composeProject.Start(c)
 

diff --git a/integration/fixtures/reqacceptgrace.toml b/integration/fixtures/reqacceptgrace.toml
@@ -7,7 +7,7 @@ logLevel = "DEBUG"
   address = ":8000"
 
 [lifeCycle]
-  reqAcceptGraceTimeOut = "10s"
+  requestAcceptGraceTimeout = "10s"
 
 [file]
 [backends]

diff --git a/server/server_signals.go b/server/server_signals.go
@@ -32,7 +32,7 @@ func (server *Server) listenSignals() {
 			}
 		default:
 			log.Infof("I have to go... %+v", sig)
-			reqAcceptGraceTimeOut := time.Duration(server.globalConfiguration.LifeCycle.ReqAcceptGraceTimeOut)
+			reqAcceptGraceTimeOut := time.Duration(server.globalConfiguration.LifeCycle.RequestAcceptGraceTimeout)
 			if reqAcceptGraceTimeOut > 0 {
 				log.Infof("Waiting %s for incoming requests to cease", reqAcceptGraceTimeOut)
 				time.Sleep(reqAcceptGraceTimeOut)