From f75a4137730739fd7fd0e76e8ccba7fe767ff248 Mon Sep 17 00:00:00 2001 From: benoitc Date: Thu, 11 Mar 2010 13:53:10 +0100 Subject: [PATCH] some fixes to config and pidfile --- gunicorn/config.py | 4 ++-- gunicorn/pidfile.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/gunicorn/config.py b/gunicorn/config.py index 8f7752dc..bba7aea8 100644 --- a/gunicorn/config.py +++ b/gunicorn/config.py @@ -12,7 +12,7 @@ from gunicorn import util class Config(object): - DEFAULT_CONFIG_FILE = 'gunicorn.conf.py', + DEFAULT_CONFIG_FILE = 'gunicorn.conf.py' DEFAULTS = dict( backlog=2048, @@ -42,7 +42,7 @@ class Config(object): def __init__(self, cmdopts, path=None): if not path: self.config_file = os.path.join(os.getcwd(), - self.DEFAULT_CONFIG_FILE) + self.DEFAULT_CONFIG_FILE) else: self.config_file = os.path.abspath(os.path.normpath(path)) self.cmdopts = cmdopts diff --git a/gunicorn/pidfile.py b/gunicorn/pidfile.py index a1294835..7252375d 100644 --- a/gunicorn/pidfile.py +++ b/gunicorn/pidfile.py @@ -3,6 +3,7 @@ # This file is part of gunicorn released under the MIT license. # See the NOTICE for more information. +import errno import os import tempfile @@ -24,7 +25,7 @@ class Pidfile(object): return path raise RuntimeError("Already running on PID %s " \ "(or pid file '%s' is stale)" % (os.getpid(), path)) - if instane._pidfile: + if instance._pidfile: self.unlink_pidfile(instance, instance._pidfile) # write pidfile