Changeset 1811

Timestamp:

10/29/07 19:27:35

Author:

fumanchu

Message:

Fix for #745 (Make a builtin tool which logs all hooks for a given request).

Files:

• trunk/cherrypy/_cprequest.py (modified) (1 diff)
• trunk/cherrypy/_cptools.py (modified) (1 diff)
• trunk/cherrypy/lib/cptools.py (modified) (1 diff)
• trunk/cherrypy/test/test_misc_tools.py (modified) (3 diffs)

trunk/cherrypy/_cprequest.py

@@ -57 +57 @@
-        """Run self.callback(**self.kwargs)."""
-        return self.callback(**self.kwargs)
+    
+    def __repr__(self):
+        cls = self.__class__
+        return ("%s.%s(callback=%r, failsafe=%r, priority=%r, %s)"
+                % (cls.__module__, cls.__name__, self.callback,
+                   self.failsafe, self.priority,
+                   ", ".join(['%s=%r' % (k, v)
+                              for k, v in self.kwargs.iteritems()])))
-
-

trunk/cherrypy/_cptools.py

@@ -428 +428 @@
-_d.log_tracebacks = Tool('before_error_response', cptools.log_traceback)
-_d.log_headers = Tool('before_error_response', cptools.log_request_headers)
+_d.log_hooks = Tool('on_end_request', cptools.log_hooks, priority=100)
-_d.err_redirect = ErrorTool(cptools.redirect)
-_d.etags = Tool('before_finalize', cptools.validate_etags)

trunk/cherrypy/lib/cptools.py

@@ -296 +296 @@
-    h = ["  %s: %s" % (k, v) for k, v in cherrypy.request.header_list]
-    cherrypy.log('\nRequest Headers:\n' + '\n'.join(h), "HTTP")
+
+def log_hooks():
+    """Write request.hooks to the cherrypy error log."""
+    msg = []
+    # Sort by the standard points if possible.
+    from cherrypy import _cprequest
+    points = _cprequest.hookpoints
+    for k in cherrypy.request.hooks.keys():
+        if k not in points:
+            points.append(k)
+    
+    for k in points:
+        msg.append("    %s:" % k)
+        v = cherrypy.request.hooks.get(k, [])
+        v.sort()
+        for h in v:
+            msg.append("        %r" % h)
+    cherrypy.log('\nRequest Hooks:\n' + '\n'.join(msg), "HTTP")
-
-def redirect(url='', internal=True):

trunk/cherrypy/test/test_misc_tools.py

@@ -1 +1 @@
-from cherrypy.test import test
-test.prefer_parent_path()
+
+import os
+localDir = os.path.dirname(__file__)
+logfile = os.path.join(localDir, "test_misc_tools.log")
-
-import cherrypy
@@ -21 +25 @@
-            'tools.response_headers.headers': [("Content-Language", "fr"),
-                                               ('Content-Type', 'text/plain')],
+            'tools.log_hooks.on': True,
-            }
-    
@@ -68 +73 @@
-    root.accept = Accept()
-    cherrypy.tree.mount(root, config=conf)
-
+
+
-
-