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

get settings module name on fork rather than on app initialization. It

Browse Source 
allows people to use relative path in their projects. fix issues #219,
and #213
This commit is contained in:
benoitc 2011-08-21 07:31:58 +02:00
parent f593922bb0
commit 17b47a376b
3 changed files with 92 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/frameworks/djangotest/settings.py
View File

@ -72,7 +72,7 @@ ROOT_URLCONF = 'djangotest.urls'
TEMPLATE_DIRS = () TEMPLATE_DIRS = ()
SOME_VALUE = "hello world 2" SOME_VALUE = "hello world"
INSTALLED_APPS = ( INSTALLED_APPS = (
'django.contrib.auth', 'django.contrib.auth',

2
gunicorn/app/base.py
View File

@ -59,7 +59,7 @@ class Application(object):
cfg = self.init(parser, opts, args) cfg = self.init(parser, opts, args)
# Load up the any app specific configuration # Load up the any app specific configuration
if cfg: if cfg and cfg is not None:
for k, v in cfg.items(): for k, v in cfg.items():
self.cfg.set(k.lower(), v) self.cfg.set(k.lower(), v)

138
gunicorn/app/djangoapp.py
View File

@ -18,42 +18,64 @@ ENVIRONMENT_VARIABLE = 'DJANGO_SETTINGS_MODULE'
class DjangoApplication(Application): class DjangoApplication(Application):
def init(self, parser, opts, args): def init(self, parser, opts, args):
self.settings_modname = None self.global_settings_path = None
self.project_path = os.getcwd() self.project_path = None
if args: if args:
settings_path = os.path.abspath(os.path.normpath(args[0])) self.global_settings_path = args[0]
if not os.path.exists(settings_path): if not os.path.exists(os.path.abspath(args[0])):
self.no_settings(settings_path) self.no_settings(args[0])
else:
self.project_path = os.path.dirname(settings_path) def get_settings_modname(self):
else: from django.conf import ENVIRONMENT_VARIABLE
# get settings module
settings_modname = None
if not self.global_settings_path:
project_path = os.getcwd()
try: try:
self.settings_modname = os.environ[ENVIRONMENT_VARIABLE] settings_modname = os.environ[ENVIRONMENT_VARIABLE]
except KeyError: except KeyError:
settings_path = os.path.join(self.project_path, "settings.py") settings_path = os.path.join(project_path, "settings.py")
if not os.path.exists(settings_path): if not os.path.exists(settings_path):
return self.no_settings(settings_path) return self.no_settings(settings_path)
else:
settings_path = os.path.abspath(self.global_settings_path)
if not os.path.exists(settings_path):
return self.no_settings(settings_path)
project_path = os.path.dirname(settings_path)
if not self.settings_modname:
project_name = os.path.split(self.project_path)[-1] if not settings_modname:
project_name = os.path.split(project_path)[-1]
settings_name, ext = os.path.splitext( settings_name, ext = os.path.splitext(
os.path.basename(settings_path)) os.path.basename(settings_path))
self.settings_modname = "%s.%s" % (project_name, settings_name) settings_modname = "%s.%s" % (project_name, settings_name)
os.environ[ENVIRONMENT_VARIABLE] = self.settings_modname os.environ[ENVIRONMENT_VARIABLE] = settings_modname
self.cfg.set("default_proc_name", self.settings_modname) self.cfg.set("default_proc_name", settings_modname)
# add the project path to sys.path # add the project path to sys.path
if not self.project_path in sys.path: if not project_path in sys.path:
sys.path.insert(0, self.project_path) # remove old project path from sys.path
sys.path.append(os.path.normpath(os.path.join(self.project_path, if self.project_path is not None:
idx = sys.path.find(self.project_path)
if idx >= 0:
del sys.path[idx]
self.project_path = project_path
sys.path.insert(0, project_path)
sys.path.append(os.path.normpath(os.path.join(project_path,
os.pardir))) os.pardir)))
def setup_environ(self): return settings_modname
def setup_environ(self, settings_modname):
from django.core.management import setup_environ from django.core.management import setup_environ
# setup environ
try: try:
parts = self.settings_modname.split(".") parts = settings_modname.split(".")
settings_mod = __import__(self.settings_modname) settings_mod = __import__(settings_modname)
if len(parts) > 1: if len(parts) > 1:
settings_mod = __import__(parts[0]) settings_mod = __import__(parts[0])
path = os.path.dirname(os.path.abspath( path = os.path.dirname(os.path.abspath(
@ -63,7 +85,7 @@ class DjangoApplication(Application):
settings_mod = getattr(settings_mod, part) settings_mod = getattr(settings_mod, part)
setup_environ(settings_mod) setup_environ(settings_mod)
except ImportError: except ImportError:
return self.no_settings(self.settings_modname, import_error=True) return self.no_settings(settings_modname, import_error=True)
def no_settings(self, path, import_error=False): def no_settings(self, path, import_error=False):
if import_error: if import_error:
@ -99,12 +121,9 @@ class DjangoApplication(Application):
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[ENVIRONMENT_VARIABLE] = self.settings_modname self.setup_environ(self.get_settings_modname())
self.setup_environ()
self.validate() self.validate()
self.activate_translation() self.activate_translation()
return WSGIHandler() return WSGIHandler()
@ -118,26 +137,14 @@ class DjangoApplicationCommand(DjangoApplication):
self.options = options self.options = options
self.admin_media_path = admin_media_path self.admin_media_path = admin_media_path
self.callable = None self.callable = None
self.project_path = None
self.init()
self.do_load_config() self.do_load_config()
for k, v in self.options.items(): for k, v in self.options.items():
if k.lower() in self.cfg.settings and v is not None: if k.lower() in self.cfg.settings and v is not None:
self.cfg.set(k.lower(), v) self.cfg.set(k.lower(), v)
def init(self):
self.settings_modname = os.environ[ENVIRONMENT_VARIABLE]
self.project_name = self.settings_modname.split('.')[0]
self.project_path = os.getcwd()
# add the project path to sys.path
if not self.project_path in sys.path:
sys.path.insert(0, self.project_path)
sys.path.append(os.path.normpath(os.path.join(self.project_path,
os.pardir)))
def load_config(self): def load_config(self):
self.cfg = Config() self.cfg = Config()
@ -172,15 +179,48 @@ class DjangoApplicationCommand(DjangoApplication):
self.cfg.set(k.lower(), v) self.cfg.set(k.lower(), v)
def get_settings_modname(self):
def reload_django_settings(self):
from django.conf import ENVIRONMENT_VARIABLE from django.conf import ENVIRONMENT_VARIABLE
os.environ[ENVIRONMENT_VARIABLE] = self.settings_modname
settings_modname = None
project_path = os.getcwd()
try:
settings_modname = os.environ[ENVIRONMENT_VARIABLE]
except KeyError:
settings_path = os.path.join(project_path, "settings.py")
if not os.path.exists(settings_path):
return self.no_settings(settings_path)
if not settings_modname:
project_name = os.path.split(project_path)[-1]
settings_name, ext = os.path.splitext(
os.path.basename(settings_path))
settings_modname = "%s.%s" % (project_name, settings_name)
os.environ[ENVIRONMENT_VARIABLE] = settings_modname
self.cfg.set("default_proc_name", settings_modname)
# add the project path to sys.path
if not project_path in sys.path:
# remove old project path from sys.path
if self.project_path is not None:
idx = sys.path.find(self.project_path)
if idx >= 0:
del sys.path[idx]
self.project_path = project_path
sys.path.insert(0, project_path)
sys.path.append(os.path.normpath(os.path.join(project_path,
os.pardir)))
# reload django settings
self.reload_django_settings(settings_modname)
return settings_modname
def reload_django_settings(self, settings_modname):
from django.conf import settings from django.conf import settings
from django.utils import importlib from django.utils import importlib
mod = importlib.import_module(self.settings_modname) mod = importlib.import_module(settings_modname)
# reload module # reload module
reload(mod) reload(mod)
@ -243,8 +283,10 @@ class DjangoApplicationCommand(DjangoApplication):
def load(self): def load(self):
from django.core.handlers.wsgi import WSGIHandler from django.core.handlers.wsgi import WSGIHandler
self.reload_django_settings() # reload django settings and setup environ
self.setup_environ() self.setup_environ(self.get_settings_modname())
# validate models and activate translation
self.validate() self.validate()
self.activate_translation() self.activate_translation()