[Checkins] SVN: zc.resumelb/trunk/src/zc/resumelb/ - Fixed: Tracelog 'I' records didn't always contain input length information.

[jim]

Log message for revision 125738:
  - Fixed: Tracelog 'I' records didn't always contain input length information.
  
  - Fixed: Tracelog 'I' records were only included when using thread pools.
  

Changed:
  U   zc.resumelb/trunk/src/zc/resumelb/README.txt
  U   zc.resumelb/trunk/src/zc/resumelb/worker.py
  U   zc.resumelb/trunk/src/zc/resumelb/worker.test

-=-
Modified: zc.resumelb/trunk/src/zc/resumelb/README.txt
===================================================================
--- zc.resumelb/trunk/src/zc/resumelb/README.txt	2012-05-08 19:54:04 UTC (rev 125737)
+++ zc.resumelb/trunk/src/zc/resumelb/README.txt	2012-05-08 19:54:10 UTC (rev 125738)
@@ -242,6 +242,13 @@
 Change History
 ==============
 
+0.5.2 (2012-05-??)
+------------------
+
+- Fixed: Tracelog 'I' records didn't always contain input length information.
+
+- Fixed: Tracelog 'I' records were only included when using thread pools.
+
 0.5.1 (2012-05-07)
 ------------------
 

Modified: zc.resumelb/trunk/src/zc/resumelb/worker.py
===================================================================
--- zc.resumelb/trunk/src/zc/resumelb/worker.py	2012-05-08 19:54:04 UTC (rev 125737)
+++ zc.resumelb/trunk/src/zc/resumelb/worker.py	2012-05-08 19:54:10 UTC (rev 125738)
@@ -118,7 +118,6 @@
 
             if threads:
                 def call_app_w_threads(trno, env):
-                    log(trno, 'I', env.get('CONTENT_LENGTH', 0))
                     return pool_apply(call_app_w_tracelog, (trno, env))
                 self.call_app = call_app_w_threads
             else:
@@ -200,13 +199,14 @@
 
     def handle(self, conn, rno, get, env):
         try:
-            if self.tracelog:
+            tracelog = self.tracelog
+            if tracelog:
                 trno = "%s.%s" % (conn.id, rno)
                 query_string = env.get('QUERY_STRING')
                 url = env['PATH_INFO']
                 if query_string:
                     url += '?' + query_string
-                self.tracelog(trno, 'B', '%s %s' % (env['REQUEST_METHOD'], url))
+                tracelog(trno, 'B', '%s %s' % (env['REQUEST_METHOD'], url))
             else:
                 trno = rno
 
@@ -229,6 +229,8 @@
                     break
             f.seek(0)
             env['wsgi.input'] = f
+            if tracelog:
+                tracelog(trno, 'I', env.get('CONTENT_LENGTH') or '0')
 
             response, body = self.call_app(trno, env)
             try:

Modified: zc.resumelb/trunk/src/zc/resumelb/worker.test
===================================================================
--- zc.resumelb/trunk/src/zc/resumelb/worker.test	2012-05-08 19:54:04 UTC (rev 125737)
+++ zc.resumelb/trunk/src/zc/resumelb/worker.test	2012-05-08 19:54:10 UTC (rev 125738)
@@ -576,12 +576,12 @@
     >>> now += datetime.timedelta(microseconds=10000)
     >>> write_message(worker_socket, 22, '')
     >>> gevent.sleep(.01)
-    I 0.22 2012-02-05 01:02:03.020456
+    I 0.22 2012-02-05 01:02:03.020456 0
     C 0.22 2012-02-05 01:02:03.020456
     >>> now += datetime.timedelta(microseconds=10000)
     >>> write_message(worker_socket, 11, '')
     >>> read_message(worker_socket) # doctest: +ELLIPSIS
-    I 0.11 2012-02-05 01:02:03.030456
+    I 0.11 2012-02-05 01:02:03.030456 0
     T 0.22 2012-02-05 01:02:03.030456 test
     - 0.22 2012-02-05 01:02:03.030456 test2
     A 0.22 2012-02-05 01:02:03.030456 200 OK 1332
@@ -612,10 +612,11 @@
     >>> now += datetime.timedelta(microseconds=10000)
     >>> worker_socket2 = gevent.socket.create_connection(worker.addr)
     >>> _ = read_message(worker_socket2)
-    >>> write_message(worker_socket2, 22, newenv('', '/hi.html'), '')
+    >>> write_message(worker_socket2, 22,
+    ...               newenv('', '/hi.html', method='POST', body='z'*42), '')
     >>> read_message(worker_socket2) # doctest: +ELLIPSIS
-    B 1.22 2012-02-05 01:02:03.040456 GET /hi.html
-    I 1.22 2012-02-05 01:02:03.040456
+    B 1.22 2012-02-05 01:02:03.040456 POST /hi.html
+    I 1.22 2012-02-05 01:02:03.040456 42
     C 1.22 2012-02-05 01:02:03.040456
     A 1.22 2012-02-05 01:02:03.040456 200 OK 79
     E 1.22 2012-02-05 01:02:03.040456