From 59ca143c77a375d863ca085cfdfee7d15b589205 Mon Sep 17 00:00:00 2001 From: Rohan Rangray Date: Fri, 22 May 2015 23:03:42 -0700 Subject: [PATCH] Fixed run_production to behave correctly with upstart --- scripts/run_production.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/run_production.sh b/scripts/run_production.sh index fd18f75..6ded945 100755 --- a/scripts/run_production.sh +++ b/scripts/run_production.sh @@ -2,6 +2,6 @@ source secrets.sh source venv/bin/activate # newrelic-admin run-program /srv/flashy-backend/venv/bin/gunicorn --pid /run/flashy/gunicorn.pid -w 6 -n flashy -b 127.0.0.1:7002 flashy.wsgi -uwsgi /etc/uwsgi/websocket.ini & -newrelic-admin run-program uwsgi /etc/uwsgi/flashy.ini -trap 'kill $(jobs -pr)' SIGINT SIGTERM EXIT +# Run the scripts with 'exec' so they're tracked by upstart properly +exec uwsgi /etc/uwsgi/websocket.ini & +exec newrelic-admin run-program uwsgi /etc/uwsgi/flashy.ini -- 1.9.1