Changeset 617

Timestamp:

09/08/05 19:02:26

Author:

fumanchu

Message:

Initial fix for #286.

Files:

• trunk/cherrypy/_cputil.py (modified) (3 diffs)
• trunk/cherrypy/test/test_core.py (modified) (2 diffs)

trunk/cherrypy/_cputil.py

@@ -35 +35 @@
-import time
-import os
-
+
+
-import cherrypy
+from cherrypy.lib import httperrors
-
-
@@ -151 +153 @@
-        f.close()
-
-from cherrypy.lib import httperrors
-
-def _cpOnHTTPError():
-    """ Default _cpOnHTTPError method """
-    status, customMessage = sys.exc_info()[1].getArgs()
-   
-m
+p
-    page = httperrors.getErrorPage(status, customMessage = customMessage)
-    cherrypy.response.status, cherrypy.response.body = page
@@ -176 +176 @@
-    showTracebacks  = cherrypy.config.get('server.showTracebacks')
-    
+    logTracebacks  = cherrypy.config.get('server.logTracebacks')
+    if logTracebacks:
+        cherrypy.log(formatExc())
+    
-    response = cherrypy.response
-    
-    if not developmentMode and httpErrors:
-        # if it isn't development mode and http errors are turned on
-
+n
-        if response.status == 404:
-            response.status, response.body = httperrors.getErrorPage(404)

trunk/cherrypy/test/test_core.py

@@ -272 +272 @@
-        'server.logFile': logFile,
-    },
+    '/error': {
+        'server.logFile': logFile,
+        'server.logTracebacks': True,
+    },
-})
-
@@ -392 +396 @@
-        data = open(logFile, "rb").readlines()
-        self.assertEqual(data[0][-53:], ' HTTP INFO 127.0.0.1 - GET /params/?thing=a HTTP/1.1\n')
+        
+        # Test that tracebacks get written to the error log.
+        ignore = helper.webtest.ignored_exceptions
+        ignore.append(ValueError)
+        try:
+            self.getPage("/error/page_method")
+            self.assertInBody("raise ValueError()")
+            data = open(logFile, "rb").readlines()
+            self.assertEqual(data[2][-41:], ' INFO Traceback (most recent call last):\n')
+            self.assertEqual(data[8], '    raise ValueError()\n')
+        finally:
+            ignore.pop()
-    
-    def testRedirect(self):