Merge branch 'master' of github.com:benoitc/gunicorn

This commit is contained in:
benoitc 2010-03-11 13:14:59 +01:00
commit 7c678d7ace

View File

@ -12,6 +12,8 @@ from gunicorn import util
class Config(object):
DEFAULT_CONFIG_FILE = 'gunicorn.conf.py',
DEFAULTS = dict(
backlog=2048,
bind='127.0.0.1:8000',
@ -39,7 +41,8 @@ class Config(object):
def __init__(self, cmdopts, path=None):
if not path:
self.config_file = os.path.join(os.getcwd(), 'gunicorn.conf.py')
self.config_file = os.path.join(os.getcwd(),
self.DEFAULT_CONFIG_FILE)
else:
self.config_file = os.path.abspath(os.path.normpath(path))
self.cmdopts = cmdopts