From 2346866ea57dafff90f505cc0eff8c456f09bef2 Mon Sep 17 00:00:00 2001 From: Benoit Chesneau Date: Sun, 31 Jan 2010 02:09:51 +0100 Subject: [PATCH] useless debug --- bin/gunicorn_django | 7 +++++-- examples/djangotest/urls.py | 10 ++++------ gunicorn/arbiter.py | 1 - 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bin/gunicorn_django b/bin/gunicorn_django index f6219fe2..3c263f4c 100755 --- a/bin/gunicorn_django +++ b/bin/gunicorn_django @@ -28,18 +28,21 @@ import os import sys -import django.core.handlers.wsgi +from django.core.handlers.wsgi import WSGIHandler() from gunicorn.main import main + __usage__ = "%prog [OPTIONS]" PROJECT_PATH = os.getcwd() PROJECT_NAME = os.path.split(PROJECT_PATH)[-1] # set environ -sys.path.insert(0, os.path.join(PROJECT_PATH, "..")) +sys.path.insert(0, os.path.join(PROJECT_PATH, os.pardir)) + os.environ['DJANGO_SETTINGS_MODULE'] = '%s.settings' % PROJECT_NAME + def get_app(parser, opts, args): # django wsgi app return django.core.handlers.wsgi.WSGIHandler() diff --git a/examples/djangotest/urls.py b/examples/djangotest/urls.py index 42627022..95790e92 100755 --- a/examples/djangotest/urls.py +++ b/examples/djangotest/urls.py @@ -1,8 +1,6 @@ -from django.conf.urls.defaults import patterns, url, handler404, handler500 + +from django.conf.urls.defaults import patterns,include urlpatterns = patterns('', - url(r'^$', 'djangotest.testing.views.home'), -) - -def __exported_functionality__(): - return [handler404, handler500] \ No newline at end of file + ('^$', include("testing.urls")), +) \ No newline at end of file diff --git a/gunicorn/arbiter.py b/gunicorn/arbiter.py index 8ed31b46..6075ec22 100644 --- a/gunicorn/arbiter.py +++ b/gunicorn/arbiter.py @@ -366,7 +366,6 @@ class Arbiter(object): self.kill_worker(pid, sig) def kill_worker(self, pid, sig): - self.log.info("ici") try: os.kill(pid, sig) except OSError, e: