Changeset 1984

Timestamp:

06/22/08 16:11:54

Author:

fumanchu

Message:

Fix for #824 (_cplogging.LogManager?.access method not handling unicode in login names properly). While I was at it, I made the access log template configurable, moved the log tests from test_core into test_logging, and added a new logtest module.

Files:

• trunk/cherrypy/_cplogging.py (modified) (2 diffs)
• trunk/cherrypy/test/logtest.py (added)
• trunk/cherrypy/test/test.py (modified) (1 diff)
• trunk/cherrypy/test/test_core.py (modified) (4 diffs)
• trunk/cherrypy/test/test_logging.py (added)

trunk/cherrypy/_cplogging.py

@@ -19 +19 @@
-    error_log = None
-    access_log = None
+    access_log_format = \
+        '%(h)s %(l)s %(u)s %(t)s "%(r)s" %(s)s %(b)s "%(f)s" "%(a)s"'
-    
-    def __init__(self, appid=None, logger_root="cherrypy"):
@@ -62 +64 @@
-    
-    def access(self):
-
+
+
+
+
+
+
+
+
+
-        request = cherrypy.request
-        inheaders = request.headers
-        remote = request.remote
-        response = cherrypy.response
-        outheaders = response.headers
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        try:
-
+elf.access_log_format % atoms
-        except:
-            self(traceback=True)

trunk/cherrypy/test/test.py

@@ -375 +375 @@
-        'test_httpauth',
-        'test_httplib',
+        'test_logging',
-        'test_objectmapping',
-        'test_misc_tools',

trunk/cherrypy/test/test_core.py

@@ -13 +13 @@
-
-
-log_file = os.path.join(localDir, "test.log")
-log_access_file = os.path.join(localDir, "access.log")
-favicon_path = os.path.join(os.getcwd(), localDir, "../favicon.ico")
-
@@ -419 +417 @@
-    
-    cherrypy.config.update({
-        'log.error_file': log_file,
-        'environment': 'test_suite',
-        'server.max_request_body_size': 200,
@@ -425 +422 @@
-        })
-    appconf = {
-        '/': {'log.access_file': log_access_file},
-        '/method': {'request.methods_with_bodies': ("POST", "PUT", "PROPFIND")},
-        }
@@ -489 +485 @@
-        msg = "Illegal response status from server ('error' is non-numeric)."
-        self.assertErrorPage(500, msg)
-    
-    def testLogging(self):
-        f = open(log_access_file, "wb")
-        f.write("")
-        f.close()
-        f = open(log_file, "wb")
-        f.write("")
-        f.close()
-        
-        self.getPage("/flatten/as_string",
-                     headers=[('Referer', 'http://www.cherrypy.org/'),
-                              ('User-Agent', 'Mozilla/5.0')])
-        self.assertBody('content')
-        self.assertStatus(200)
-        
-        self.getPage("/flatten/as_yield")
-        self.assertBody('content')
-        self.assertStatus(200)
-        
-        data = open(log_access_file, "rb").readlines()
-        
-        host = self.HOST
-        if host == '0.0.0.0':
-            # INADDR_ANY, which should respond on localhost.
-            host = "127.0.0.1"
-        if host == '::':
-            # IN6ADDR_ANY, which should respond on localhost.
-            host = "::1"
-        intro = '%s - - [' % host
-        
-        if not data[0].startswith(intro):
-            self.fail("%r doesn't start with %r" % (data[0], intro))
-        haslength = False
-        for k, v in self.headers:
-            if k.lower() == 'content-length':
-                haslength = True
-        line = data[-2].strip()
-        if haslength:
-            if not line.endswith('] "GET %s/flatten/as_string HTTP/1.1" 200 7 '
-                                 '"http://www.cherrypy.org/" "Mozilla/5.0"'
-                                 % self.prefix()):
-                self.fail(line)
-        else:
-            if not line.endswith('] "GET %s/flatten/as_string HTTP/1.1" 200 - '
-                                 '"http://www.cherrypy.org/" "Mozilla/5.0"'
-                                 % self.prefix()):
-                self.fail(line)
-        
-        if not data[-1].startswith(intro):
-            self.fail("%r doesn't start with %r" % (data[-1], intro))
-        haslength = False
-        for k, v in self.headers:
-            if k.lower() == 'content-length':
-                haslength = True
-        line = data[-1].strip()
-        if haslength:
-            self.assert_(line.endswith('] "GET %s/flatten/as_yield HTTP/1.1" 200 7 "" ""'
-                                          % self.prefix()))
-        else:
-            self.assert_(line.endswith('] "GET %s/flatten/as_yield HTTP/1.1" 200 - "" ""'
-                                          % self.prefix()))
-        
-        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()")
-            data = open(log_file, "rb").readlines()
-            self.assertEqual(data[0].strip().endswith('HTTP Traceback (most recent call last):'), True)
-            self.assertEqual(data[-3].strip().endswith('raise ValueError()'), True)
-        finally:
-            ignore.pop()
-    
-    def testSlashes(self):