Changeset 805

Timestamp:

11/10/05 00:04:09

Author:

fumanchu

Message:

Fix for #386 (separate config entry for logging unhandled exceptions).

Files:

• trunk/cherrypy/_cphttptools.py (modified) (1 diff)
• trunk/cherrypy/_cputil.py (modified) (1 diff)
• trunk/cherrypy/test/test_core.py (modified) (4 diffs)

trunk/cherrypy/_cphttptools.py

@@ -1 +1 @@
-"""CherryPy core request/response handling."""
-
-import cgi
-import Cookie
-import os
-import re
-import sys
-import types

trunk/cherrypy/_cputil.py

@@ -306 +306 @@
-def _cpOnError():
-    """ Default _cpOnError method """
+    # Allow logging of only *unexpected* HTTPError's.
+    if (not cherrypy.config.get('server.logTracebacks', True)
+        and cherrypy.config.get('server.logUnhandledTracebacks', True)):
+        cherrypy.log(formatExc())
+    
-    cherrypy.HTTPError(500).set_response()
-

trunk/cherrypy/test/test_core.py

@@ -171 +171 @@
-        # Since status must start with an int, this should error.
-        cherrypy.response.status = "ZOO OK"
+    
+    def log_unhandled(self):
+        raise ValueError()
-
-
@@ -353 +356 @@
-        'errorPage.404': "nonexistent.html",
-    },
+    '/error/log_unhandled': {
+        'server.logTracebacks': False,
+        'server.logUnhandledTracebacks': True,
+    },
-})
-
@@ -453 +460 @@
-        self.assertEqual(data, [])
-        
-        # Test that tracebacks get written to the error log.
-        ignore = helper.webtest.ignored_exceptions
-        ignore.append(ValueError)
-        try:
+            # Test that tracebacks get written to the error log.
-            self.getPage("/error/page_method")
-            self.assertInBody("raise ValueError()")
@@ -462 +469 @@
-            self.assertEqual(data[0][-41:], ' INFO Traceback (most recent call last):\n')
-            self.assertEqual(data[6], '    raise ValueError()\n')
+            
+            # Test that unhandled tracebacks get written to the error log
+            # if logTracebacks is False but logUnhandledTracebacks is True.
+            self.getPage("/error/log_unhandled")
+            self.assertInBody("raise ValueError()")
+            data = open(logFile, "rb").readlines()
+            self.assertEqual(data[9][-41:], ' INFO Traceback (most recent call last):\n')
+            self.assertEqual(data[15], '    raise ValueError()\n')
+            # Each error should write only one traceback (9 lines each).
+            self.assertEqual(len(data), 18)
-        finally:
-            ignore.pop()