Merge pull request #3035 from metabrainz/uwsgi-conf

LB-1676: Kill lingering uWSGI processes on restart

docker/consul-template.conf

@@ -1,7 +1,6 @@
 template {
     source = "/code/listenbrainz/consul_config.py.ctmpl"
     destination = "/code/listenbrainz/listenbrainz/config.py"
-    command = "sv hup uwsgi"
 }
 template {
     source = "/code/listenbrainz/admin/config.sh.ctmpl"

docker/services/api_compat/api_compat.service

@@ -1,4 +1,16 @@
 #!/bin/bash
 
+set -x
+
+UWSGI_PID_FILE=/tmp/uwsgi-api-compat.pid
+if [ -e "$UWSGI_PID_FILE" ]; then
+  UWSGI_PID=`cat "$UWSGI_PID_FILE"`
+  echo "Previous uwsgi master process pid file detected, killing process $UWSGI_PID..."
+  kill -TERM "$UWSGI_PID"
+  sleep 4
+fi
+
+# wait for syslog to start up
 sleep 1
+
 exec run-consul-template -config /etc/consul-template-api-compat.conf

docker/services/api_compat/uwsgi-api-compat.ini

@@ -13,3 +13,4 @@ disable-logging = true
 ; quit uwsgi if the python app fails to load
 need-app = true
 die-on-term = true
+safe-pidfile = /tmp/uwsgi-api-compat.pid

docker/services/labs_api/labs_api.service

@@ -1,4 +1,16 @@
 #!/bin/bash
 
+set -x
+
+UWSGI_PID_FILE=/tmp/uwsgi-labs-api.pid
+if [ -e "$UWSGI_PID_FILE" ]; then
+  UWSGI_PID=`cat "$UWSGI_PID_FILE"`
+  echo "Previous uwsgi master process pid file detected, killing process $UWSGI_PID..."
+  kill -TERM "$UWSGI_PID"
+  sleep 4
+fi
+
+# wait for syslog to start up
 sleep 1
+
 exec run-consul-template -config /etc/consul-template-labs-api.conf

docker/services/labs_api/uwsgi-labs-api.ini

@@ -15,3 +15,4 @@ need-app = true
 ; increase buffer size for requests that send a lot of mbids in query params
 buffer-size = 8192
 die-on-term = true
+safe-pidfile = /tmp/uwsgi-labs-api.pid

docker/services/uwsgi/consul-template-uwsgi.conf

@@ -1,6 +1,7 @@
 template {
     source = "/etc/uwsgi/uwsgi.ini.ctmpl"
     destination = "/etc/uwsgi/uwsgi.ini"
+    command = "sv hup uwsgi"
 }
 
 template {

docker/services/uwsgi/uwsgi.ini.ctmpl

@@ -20,3 +20,4 @@ need-app = true
 ; increase buffer size for requests that send a lot of mbids in query params
 buffer-size = 8192
 die-on-term = true
+safe-pidfile = /tmp/uwsgi.pid

docker/services/uwsgi/uwsgi.service

@@ -1,4 +1,16 @@
 #!/bin/bash
 
+set -x
+
+UWSGI_PID_FILE=/tmp/uwsgi.pid
+if [ -e "$UWSGI_PID_FILE" ]; then
+  UWSGI_PID=`cat "$UWSGI_PID_FILE"`
+  echo "Previous uwsgi master process pid file detected, killing process $UWSGI_PID..."
+  kill -TERM "$UWSGI_PID"
+  sleep 4
+fi
+
+# wait for syslog to start up
 sleep 1
+
 exec run-consul-template -config /etc/consul-template-uwsgi.conf