Skip to content

Commit

Permalink
Renamed django.core.handler.CoreHandler to ModPythonHandler, in prepa…
Browse files Browse the repository at this point in the history
…ration for WSGI support

git-svn-id: http://code.djangoproject.com/svn/django/trunk@168 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information
adrianholovaty committed Jul 18, 2005
1 parent feeeda9 commit 4e094e2
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
10 changes: 5 additions & 5 deletions django/bin/profiling/handler.py
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
import hotshot, time, os
from django.core.handler import CoreHandler
from django.core.handler import ModPythonHandler

PROFILE_DATA_DIR = "/var/log/cmsprofile/"

def handler(req):
'''
Handler that uses hotshot to store profile data.
Stores profile data in PROFILE_DATA_DIR. Since hotshot has no way (that I
know of) to append profile data to a single file, each request gets its own
profile. The file names are in the format <url>.<n>.prof where <url> is
the request path with "/" replaced by ".", and <n> is a timestamp with
microseconds to prevent overwriting files.
Use the gather_profile_stats.py script to gather these individual request
profiles into aggregated profiles by request path.
profiles into aggregated profiles by request path.
'''
profname = "%s.%.3f.prof" % (req.uri.strip("/").replace('/', '.'), time.time())
profname = os.path.join(PROFILE_DATA_DIR, profname)
prof = hotshot.Profile(profname)
return prof.runcall(CoreHandler(), req)
return prof.runcall(ModPythonHandler(), req)
6 changes: 3 additions & 3 deletions django/core/handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
from django.utils import httpwrappers

# NOTE: do *not* import settings (or any module which eventually imports
# settings) until after CoreHandler has been called; otherwise os.environ
# settings) until after ModPythonHandler has been called; otherwise os.environ
# won't be set up correctly (with respect to settings).

class CoreHandler:
class ModPythonHandler:

def __init__(self):
self._request_middleware = self._view_middleware = self._response_middleware = None
Expand Down Expand Up @@ -147,4 +147,4 @@ def _get_traceback(self):
return '\n'.join(traceback.format_exception(*sys.exc_info()))

def handler(req):
return CoreHandler()(req)
return ModPythonHandler()(req)

0 comments on commit 4e094e2

Please sign in to comment.