p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Renamed django.core.handler.CoreHandler to ModPythonHandler, in preparation for WSGI support 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@168 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2005-07-18 06:10:00 +00:00
parent feeeda969c
commit 4e094e26e6
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
django/bin/profiling/handler.py
View File

@ -1,22 +1,22 @@
import hotshot, time, os import hotshot, time, os
from django.core.handler import CoreHandler from django.core.handler import ModPythonHandler
PROFILE_DATA_DIR = "/var/log/cmsprofile/" PROFILE_DATA_DIR = "/var/log/cmsprofile/"
def handler(req): def handler(req):
''' '''
Handler that uses hotshot to store profile data. Handler that uses hotshot to store profile data.
Stores profile data in PROFILE_DATA_DIR. Since hotshot has no way (that I 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 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 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 the request path with "/" replaced by ".", and <n> is a timestamp with
microseconds to prevent overwriting files. microseconds to prevent overwriting files.
Use the gather_profile_stats.py script to gather these individual request 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 = "%s.%.3f.prof" % (req.uri.strip("/").replace('/', '.'), time.time())
profname = os.path.join(PROFILE_DATA_DIR, profname) profname = os.path.join(PROFILE_DATA_DIR, profname)
prof = hotshot.Profile(profname) prof = hotshot.Profile(profname)
return prof.runcall(CoreHandler(), req) return prof.runcall(ModPythonHandler(), req)

6
django/core/handler.py
View File

@ -2,10 +2,10 @@ import os
from django.utils import httpwrappers from django.utils import httpwrappers
# NOTE: do *not* import settings (or any module which eventually imports # 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). # won't be set up correctly (with respect to settings).
class CoreHandler: class ModPythonHandler:
def __init__(self): def __init__(self):
self._request_middleware = self._view_middleware = self._response_middleware = None self._request_middleware = self._view_middleware = self._response_middleware = None
@ -147,4 +147,4 @@ class CoreHandler:
return '\n'.join(traceback.format_exception(*sys.exc_info())) return '\n'.join(traceback.format_exception(*sys.exc_info()))
def handler(req): def handler(req):
return CoreHandler()(req) return ModPythonHandler()(req)