Merge pull request #30 from wiremind/master

Graceful shutdown nginx and uwsgi
tiangolo · Jun 22, 2018 · 85196f3 · 85196f3
2 parents 8d5c248 + 870a7a0
commit 85196f3
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 0 deletions.
diff --git a/python2.7-alpine3.7/supervisord.ini b/python2.7-alpine3.7/supervisord.ini
@@ -14,3 +14,5 @@ stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes=0
 stderr_logfile=/dev/stderr
 stderr_logfile_maxbytes=0
+# Graceful stop, see http://nginx.org/en/docs/control.html
+stopsignal=QUIT
diff --git a/python2.7-alpine3.7/uwsgi.ini b/python2.7-alpine3.7/uwsgi.ini
@@ -2,3 +2,5 @@
 socket = /tmp/uwsgi.sock
 chown-socket = nginx:nginx
 chmod-socket = 664
+# Graceful shutdown on SIGTERM, see https://github.com/unbit/uwsgi/issues/849#issuecomment-118869386
+hook-master-start = unix_signal:15 gracefully_kill_them_all
diff --git a/python2.7/supervisord.conf b/python2.7/supervisord.conf
@@ -14,3 +14,5 @@ stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes=0
 stderr_logfile=/dev/stderr
 stderr_logfile_maxbytes=0
+# Graceful stop, see http://nginx.org/en/docs/control.html
+stopsignal=QUIT
diff --git a/python2.7/uwsgi.ini b/python2.7/uwsgi.ini
@@ -2,3 +2,5 @@
 socket = /tmp/uwsgi.sock
 chown-socket = nginx:nginx
 chmod-socket = 664
+# Graceful shutdown on SIGTERM, see https://github.com/unbit/uwsgi/issues/849#issuecomment-118869386
+hook-master-start = unix_signal:15 gracefully_kill_them_all
diff --git a/python3.5/supervisord.conf b/python3.5/supervisord.conf
@@ -14,3 +14,5 @@ stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes=0
 stderr_logfile=/dev/stderr
 stderr_logfile_maxbytes=0
+# Graceful stop, see http://nginx.org/en/docs/control.html
+stopsignal=QUIT
diff --git a/python3.5/uwsgi.ini b/python3.5/uwsgi.ini
@@ -2,3 +2,5 @@
 socket = /tmp/uwsgi.sock
 chown-socket = nginx:nginx
 chmod-socket = 664
+# Graceful shutdown on SIGTERM, see https://github.com/unbit/uwsgi/issues/849#issuecomment-118869386
+hook-master-start = unix_signal:15 gracefully_kill_them_all
diff --git a/python3.6-alpine3.7/supervisord.ini b/python3.6-alpine3.7/supervisord.ini
@@ -14,3 +14,5 @@ stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes=0
 stderr_logfile=/dev/stderr
 stderr_logfile_maxbytes=0
+# Graceful stop, see http://nginx.org/en/docs/control.html
+stopsignal=QUIT
diff --git a/python3.6-alpine3.7/uwsgi.ini b/python3.6-alpine3.7/uwsgi.ini
@@ -2,3 +2,5 @@
 socket = /tmp/uwsgi.sock
 chown-socket = nginx:nginx
 chmod-socket = 664
+# Graceful shutdown on SIGTERM, see https://github.com/unbit/uwsgi/issues/849#issuecomment-118869386
+hook-master-start = unix_signal:15 gracefully_kill_them_all
diff --git a/python3.6/supervisord.conf b/python3.6/supervisord.conf
@@ -14,3 +14,5 @@ stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes=0
 stderr_logfile=/dev/stderr
 stderr_logfile_maxbytes=0
+# Graceful stop, see http://nginx.org/en/docs/control.html
+stopsignal=QUIT
diff --git a/python3.6/uwsgi.ini b/python3.6/uwsgi.ini
@@ -2,3 +2,5 @@
 socket = /tmp/uwsgi.sock
 chown-socket = nginx:nginx
 chmod-socket = 664
+# Graceful shutdown on SIGTERM, see https://github.com/unbit/uwsgi/issues/849#issuecomment-118869386
+hook-master-start = unix_signal:15 gracefully_kill_them_all