From 8f69d17e8612dd8f33355a4bfd7a46ba635f1403 Mon Sep 17 00:00:00 2001 From: Nate Coraor Date: Fri, 1 Dec 2017 16:25:20 -0500 Subject: [PATCH] Don't use uWSGI master mode by default. Fixes Ctrl+C on macOS and is really only important in production configs where you should be using a config file anyway. --- scripts/get_uwsgi_args.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/get_uwsgi_args.py b/scripts/get_uwsgi_args.py index bd73a5501e6..d8fbc0e505e 100644 --- a/scripts/get_uwsgi_args.py +++ b/scripts/get_uwsgi_args.py @@ -22,7 +22,7 @@ ALIASES = { 'http': ('httprouter', 'socket', 'uwsgi-socket', 'suwsgi-socket', 'ssl-socket'), } DEFAULT_ARGS = { - '_all_': ('virtualenv', 'pythonpath', 'master', 'threads', 'http', 'static-map', 'die-on-term', 'hook-master-start', 'enable-threads'), + '_all_': ('virtualenv', 'pythonpath', 'threads', 'http', 'static-map', 'die-on-term', 'hook-master-start', 'enable-threads'), 'galaxy': ('py-call-osafterfork',), 'reports': (), 'tool_shed': (), @@ -89,7 +89,6 @@ def _get_uwsgi_args(cliargs, kwargs): defaults = { 'virtualenv': os.environ.get('VIRTUAL_ENV', './.venv'), 'pythonpath': 'lib', - 'master': True, 'threads': '4', 'http': 'localhost:{port}'.format(port=DEFAULT_PORTS[cliargs.app]), 'static-map': ('/static/style={here}/static/style/blue'.format(here=os.getcwd()),