summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cherrypy/lib/profiler.py10
-rw-r--r--cherrypy/process/plugins.py2
-rw-r--r--cherrypy/process/win32.py3
3 files changed, 12 insertions, 3 deletions
diff --git a/cherrypy/lib/profiler.py b/cherrypy/lib/profiler.py
index 9d5481dd..704fec47 100644
--- a/cherrypy/lib/profiler.py
+++ b/cherrypy/lib/profiler.py
@@ -160,7 +160,15 @@ class ProfileAggregator(Profiler):
class make_app:
def __init__(self, nextapp, path=None, aggregate=False):
- """Make a WSGI middleware app which wraps 'nextapp' with profiling."""
+ """Make a WSGI middleware app which wraps 'nextapp' with profiling.
+
+ nextapp: the WSGI application to wrap, usually an instance of
+ cherrypy.Application.
+ path: where to dump the profiling output.
+ aggregate: if True, profile data for all HTTP requests will go in
+ a single file. If False (the default), each HTTP request will
+ dump its profile data into a separate file.
+ """
self.nextapp = nextapp
self.aggregate = aggregate
if aggregate:
diff --git a/cherrypy/process/plugins.py b/cherrypy/process/plugins.py
index 7f3cde7e..cdbf4cdb 100644
--- a/cherrypy/process/plugins.py
+++ b/cherrypy/process/plugins.py
@@ -21,6 +21,7 @@ class SimplePlugin(object):
def subscribe(self):
"""Register this object as a (multi-channel) listener on the bus."""
for channel in self.bus.listeners:
+ # Subscribe self.start, self.exit, etc. if present.
method = getattr(self, channel, None)
if method is not None:
self.bus.subscribe(channel, method)
@@ -28,6 +29,7 @@ class SimplePlugin(object):
def unsubscribe(self):
"""Unregister this object as a listener on the bus."""
for channel in self.bus.listeners:
+ # Unsubscribe self.start, self.exit, etc. if present.
method = getattr(self, channel, None)
if method is not None:
self.bus.unsubscribe(channel, method)
diff --git a/cherrypy/process/win32.py b/cherrypy/process/win32.py
index 9db928da..858821d0 100644
--- a/cherrypy/process/win32.py
+++ b/cherrypy/process/win32.py
@@ -71,8 +71,7 @@ class ConsoleCtrlHandler(plugins.SimplePlugin):
class Win32Bus(wspbus.Bus):
"""A Web Site Process Bus implementation for Win32.
- Instead of using time.sleep for blocking, this bus uses native
- win32event objects. It also responds to console events.
+ Instead of time.sleep, this bus blocks using native win32event objects.
"""
def __init__(self):