Changeset 1098

Timestamp:

05/07/06 17:21:50

Author:

fumanchu

Message:

Moved the profiler setup into _cprequest (so it's all in one place now).

Files:

• trunk/cherrypy/_cpengine.py (modified) (2 diffs)
• trunk/cherrypy/_cprequest.py (modified) (2 diffs)

trunk/cherrypy/_cpengine.py

@@ -8 +8 @@
-import cherrypy
-from cherrypy import _cprequest
-profiler, 
+
-
-# Use a flag to indicate the state of the application engine.
@@ -47 +47 @@
-            from cherrypy.lib import covercp
-            covercp.start()
-        
-        # Set up the profiler if requested.
-        if conf("profiling.on", False):
-            ppath = conf("profiling.path", "")
-            cherrypy.profiler = profiler.Profiler(ppath)
-        else:
-            cherrypy.profiler = None
-        
-        # Autoreload. Note that, if we're not starting our own HTTP server,

trunk/cherrypy/_cprequest.py

@@ -8 +8 @@
-import cherrypy
-from cherrypy import _cperror, _cputil, _cpcgifs, tools
-
+, profiler
-
-
@@ -69 +69 @@
-        self.simple_cookie = Cookie.SimpleCookie()
-        
-
+
+
+
+
+
+
+
-            cherrypy.profiler.run(self._run)
-        else: