Merge pull request #745 from tilgovi/worker-signals-mixup

Fix mixed up worker signal handling

docs/source/signals.rst

@@ -35,8 +35,8 @@ Sending signals directly to the worker processes should not normally be
 needed.  If the master process is running, any exited worker will be
 automatically respawned.
 
-- **QUIT**, **INT**: Graceful shutdown
-- **TERM**: Quick shutdown
+- **QUIT**, **INT**: Quick shutdown
+- **TERM**: Graceful shutdown
 - **USR1**: Reopen the log files
 
 Reload the configuration

gunicorn/arbiter.py

@@ -336,9 +336,9 @@ class Arbiter(object):
         killed gracefully  (ie. trying to wait for the current connection)
         """
         self.LISTENERS = []
-        sig = signal.SIGQUIT
+        sig = signal.SIGTERM
         if not graceful:
-            sig = signal.SIGTERM
+            sig = signal.SIGQUIT
         limit = time.time() + self.cfg.graceful_timeout
         while self.WORKERS and time.time() < limit:
             self.kill_workers(sig)