jingrow/gunicorn
1
0
Fork 0
mirror of https://github.com/frappe/gunicorn.git synced 2026-01-14 11:09:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix issue #110, handle environment variable (DJANGO_SETTINGS_MODULE by

Browse Source 
default) to find setting module. Thanks for the feedback!
This commit is contained in:
benoitc 2010-10-25 19:17:46 +02:00
parent c6f1a56f19
commit be1990007d
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gunicorn/app/djangoapp.py
View File

@ -13,8 +13,10 @@ from gunicorn.app.base import Application
class DjangoApplication(Application): class DjangoApplication(Application):
def init(self, parser, opts, args): def init(self, parser, opts, args):
from django.conf import ENVIRONMENT_VARIABLE
from django.core.management import setup_environ
self.project_path = os.getcwd() self.project_path = os.getcwd()
if args: if args:
settings_path = os.path.abspath(os.path.normpath(args[0])) settings_path = os.path.abspath(os.path.normpath(args[0]))
if not os.path.exists(settings_path): if not os.path.exists(settings_path):
@ -22,9 +24,18 @@ class DjangoApplication(Application):
else: else:
self.project_path = os.path.dirname(settings_path) self.project_path = os.path.dirname(settings_path)
else: else:
settings_path = os.path.join(self.project_path, "settings.py") try:
if not os.path.exists(settings_path): self.settings_modname = os.environ[ENVIRONMENT_VARIABLE]
self.no_settings(settings_path) try:
import settings
setup_environ(settings)
except ImportError:
self.no_settings(settings_path, import_error=True)
return
except KeyError:
settings_path = os.path.join(self.project_path, "settings.py")
if not os.path.exists(settings_path):
self.no_settings(settings_path)
project_name = os.path.split(self.project_path)[-1] project_name = os.path.split(self.project_path)[-1]
settings_name, ext = os.path.splitext(os.path.basename(settings_path)) settings_name, ext = os.path.splitext(os.path.basename(settings_path))
@ -34,15 +45,19 @@ class DjangoApplication(Application):
sys.path.insert(0, self.project_path) sys.path.insert(0, self.project_path)
sys.path.append(os.path.join(self.project_path, os.pardir)) sys.path.append(os.path.join(self.project_path, os.pardir))
def no_settings(self, path): def no_settings(self, path, import_error=False):
error = "Settings file '%s' not found in current folder.\n" % path if import_error:
error = "Error: Can't find the file 'settings.py' %r." % __file__
else:
error = "Settings file '%s' not found in current folder.\n" % path
sys.stderr.write(error) sys.stderr.write(error)
sys.stderr.flush() sys.stderr.flush()
sys.exit(1) sys.exit(1)
def load(self): def load(self):
from django.conf import ENVIRONMENT_VARIABLE
from django.core.handlers.wsgi import WSGIHandler from django.core.handlers.wsgi import WSGIHandler
os.environ['DJANGO_SETTINGS_MODULE'] = self.settings_modname os.environ[ENVIRONMENT_VARIABLE] = self.settings_modname
return WSGIHandler() return WSGIHandler()
class DjangoApplicationCommand(Application): class DjangoApplicationCommand(Application):