From 26bd15040c5b2d6e9d316ea05b78681b6ae853b2 Mon Sep 17 00:00:00 2001 From: Vince Mi Date: Sun, 22 Apr 2012 04:22:47 -0700 Subject: [PATCH 1/2] Use threaded Werkzeug server by default --- devserver/management/commands/runserver.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devserver/management/commands/runserver.py b/devserver/management/commands/runserver.py index 182eb4e..e52eed2 100644 --- a/devserver/management/commands/runserver.py +++ b/devserver/management/commands/runserver.py @@ -125,7 +125,7 @@ def inner_run(): server_type = 'werkzeug' else: server_type = 'django' - print "%s %s server is running at http://%s:%s/" % (options['use_forked'] and 'Forked' or 'Threaded', server_type, addr, port) + print "%s %s server is running at http://%s:%s/" % ('Forked' if not options['use_werkzeug'] and options['use_forked'] else 'Threaded', server_type, addr, port) print "Quit the server with %s." % quit_command # django.core.management.base forces the locale to en-us. We should @@ -172,7 +172,7 @@ def inner_run(): try: if use_werkzeug: run_simple(addr, int(port), DebuggedApplication(app, True), - use_reloader=False, use_debugger=True) + use_reloader=False, use_debugger=True, threaded=True) else: run(addr, int(port), app, mixin) except WSGIServerException, e: From 7374094abd69b5c5255a296131a7080916065e70 Mon Sep 17 00:00:00 2001 From: Vince Mi Date: Sun, 22 Apr 2012 04:52:57 -0700 Subject: [PATCH 2/2] actually use forked werkzeug server with 10 processes --- devserver/management/commands/runserver.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devserver/management/commands/runserver.py b/devserver/management/commands/runserver.py index e52eed2..5d80980 100644 --- a/devserver/management/commands/runserver.py +++ b/devserver/management/commands/runserver.py @@ -125,7 +125,7 @@ def inner_run(): server_type = 'werkzeug' else: server_type = 'django' - print "%s %s server is running at http://%s:%s/" % ('Forked' if not options['use_werkzeug'] and options['use_forked'] else 'Threaded', server_type, addr, port) + print "%s %s server is running at http://%s:%s/" % ('Forked' if options['use_forked'] else 'Threaded', server_type, addr, port) print "Quit the server with %s." % quit_command # django.core.management.base forces the locale to en-us. We should @@ -172,7 +172,7 @@ def inner_run(): try: if use_werkzeug: run_simple(addr, int(port), DebuggedApplication(app, True), - use_reloader=False, use_debugger=True, threaded=True) + use_reloader=False, use_debugger=True, threaded=not options['use_forked'], processes=10 if options['use_forked'] else 1) else: run(addr, int(port), app, mixin) except WSGIServerException, e: