Merge pull request benoitc#1137 from abesto/doc/graceful_timeout

Clarify documentation of graceful_timeout
mjjbell · Nov 2, 2015 · e15f262 · e15f262
2 parents e50ff77 + 18a98a4
commit e15f262
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/docs/source/settings.rst b/docs/source/settings.rst
@@ -185,9 +185,9 @@ graceful_timeout
 
 Timeout for graceful workers restart.
 
-Generally set to thirty seconds. How max time worker can handle
-request after got restart signal. If the time is up worker will
-be force killed.
+After receiving a restart signal, workers have this much time to finish
+serving requests. Workers still alive after the timeout (starting from
+the receipt of the restart signal) are force killed.
 
 keepalive
 ~~~~~~~~~

diff --git a/gunicorn/config.py b/gunicorn/config.py
@@ -681,9 +681,9 @@ class GracefulTimeout(Setting):
     desc = """\
         Timeout for graceful workers restart.
 
-        Generally set to thirty seconds. How max time worker can handle
-        request after got restart signal. If the time is up worker will
-        be force killed.
+        After receiving a restart signal, workers have this much time to finish 
+        serving requests. Workers still alive after the timeout (starting from 
+        the receipt of the restart signal) are force killed.
         """