Changeset 782

Timestamp:

11/03/05 00:52:16

Author:

fumanchu

Message:

Removed duplicate error log write that was deprecated in 2.1.

Files:

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

trunk/cherrypy/_cphttptools.py

@@ -215 +215 @@
-                self.simpleCookie.load(value)
-        
-        # Write a message to the error.log only if there is no access.log.
-        # This is only here for backwards-compatibility (with the time
-        # before the access.log existed), and should be removed in CP 2.2.
-        fname = cherrypy.config.get('server.logAccessFile', '')
-        if not fname:
-            msg = "%s - %s" % (self.remoteAddr, self.requestLine)
-            cherrypy.log(msg, "HTTP")
-        
-        # Save original values (in case they get modified by filters)
-        self.originalParamMap = self.paramMap

trunk/cherrypy/test/test_core.py

@@ -431 +431 @@
-        self.assertEqual(data, [])
-        
-        # Test that error log gets access messages if no logAccess defined.
-        self.getPage("/params/?thing=a")
-        self.assertBody("'a'")
-        data = open(logFile, "rb").readlines()
-        self.assert_(data[0].endswith(' HTTP INFO 127.0.0.1 - GET %s/params/?thing=a HTTP/1.1\n'
-                                      % helper.vroot))
-        
-        # Test that tracebacks get written to the error log.
-        ignore = helper.webtest.ignored_exceptions
@@ -445 +438 @@
-            self.assertInBody("raise ValueError()")
-            data = open(logFile, "rb").readlines()
-2
-8
+0
+6
-        finally:
-            ignore.pop()