From 593051a43d90cc82ef767808035882ca2398a999 Mon Sep 17 00:00:00 2001 From: Benoit Chesneau Date: Wed, 10 Feb 2010 09:54:01 +0100 Subject: [PATCH] only looks for settings.py after we set the command line options --- gunicorn/main.py | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/gunicorn/main.py b/gunicorn/main.py index 01c232b5..5713878e 100644 --- a/gunicorn/main.py +++ b/gunicorn/main.py @@ -173,23 +173,23 @@ def run(): main(__usage__, get_app) def run_django(): - import django.core.handlers.wsgi - - PROJECT_PATH = os.getcwd() - if not os.path.isfile(os.path.join(PROJECT_PATH, "settings.py")): - print >>sys.stderr, "settings file not found." - sys.exit(1) - - PROJECT_NAME = os.path.split(PROJECT_PATH)[-1] - - sys.path.insert(0, PROJECT_PATH) - sys.path.append(os.path.join(PROJECT_PATH, os.pardir)) - - # set environ - os.environ['DJANGO_SETTINGS_MODULE'] = '%s.settings' % PROJECT_NAME - def get_app(parser, opts, args): + import django.core.handlers.wsgi + + PROJECT_PATH = os.getcwd() + if not os.path.isfile(os.path.join(PROJECT_PATH, "settings.py")): + print >>sys.stderr, "settings file not found." + sys.exit(1) + + PROJECT_NAME = os.path.split(PROJECT_PATH)[-1] + + sys.path.insert(0, PROJECT_PATH) + sys.path.append(os.path.join(PROJECT_PATH, os.pardir)) + + # set environ + os.environ['DJANGO_SETTINGS_MODULE'] = '%s.settings' % PROJECT_NAME + # django wsgi app return django.core.handlers.wsgi.WSGIHandler()