Changeset 1487

Timestamp:

12/09/06 13:29:20

Author:

fumanchu

Message:

2.x backport of [1098] (moved the profiler setup into _cprequest (so it's all in one place now)).

Files:

• branches/cherrypy-2.x/cherrypy/_cpengine.py (modified) (2 diffs)
• branches/cherrypy-2.x/cherrypy/_cphttptools.py (modified) (2 diffs)

branches/cherrypy-2.x/cherrypy/_cpengine.py

@@ -9 +9 @@
-import cherrypy
-from cherrypy import _cphttptools, filters
-profiler, 
+
-
-# Use a flag to indicate the state of the application server.
@@ -62 +62 @@
-            and conf('session.storage_type') == 'file'):
-            cherrypy._sessionFileLock = threading.RLock()
-        
-        # Set up the profiler if requested.
-        if conf("profiling.on", False):
-            ppath = conf("profiling.path", "")
-            cherrypy.profiler = profiler.Profiler(ppath)
-        else:
-            cherrypy.profiler = None
-        
-        # Initialize the built in filters

branches/cherrypy-2.x/cherrypy/_cphttptools.py

@@ -9 +9 @@
-from cherrypy import _cputil, _cpcgifs
-from cherrypy.filters import applyFilters
-
+, profiler
-
-
@@ -67 +67 @@
-        self.simpleCookie = self.simple_cookie # Backward compatibility
-        
-
+
+
+
+
+
+
+
-            cherrypy.profiler.run(self._run)
-        else: