[Checkins] SVN: zc.resumelb/trunk/src/zc/resumelb/ Tweaked tracelog handling to use the API provided bty zservertracelog.

[jim]

Log message for revision 124651:
  Tweaked tracelog handling to use the API provided bty zservertracelog.
  
  Allow control of the env key used for application logging.
  

Changed:
  U   zc.resumelb/trunk/src/zc/resumelb/tests.py
  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/tests.py
===================================================================
--- zc.resumelb/trunk/src/zc/resumelb/tests.py	2012-03-20 16:03:35 UTC (rev 124650)
+++ zc.resumelb/trunk/src/zc/resumelb/tests.py	2012-03-20 16:03:41 UTC (rev 124651)
@@ -57,7 +57,8 @@
 def sleep(bobo_request, dur=0):
     time.sleep(float(dur))
     if 'tracelog' in bobo_request.environ:
-        bobo_request.environ['tracelog']('T', 'test')
+        bobo_request.environ['tracelog'].log('test', 'T')
+        bobo_request.environ['tracelog'].log('test2')
     return 'hello world\n'
 
 @bobo.query('/gsleep.html')

Modified: zc.resumelb/trunk/src/zc/resumelb/worker.py
===================================================================
--- zc.resumelb/trunk/src/zc/resumelb/worker.py	2012-03-20 16:03:35 UTC (rev 124650)
+++ zc.resumelb/trunk/src/zc/resumelb/worker.py	2012-03-20 16:03:41 UTC (rev 124651)
@@ -26,7 +26,8 @@
 
     def __init__(self, app, addr,
                  history=9999, max_skill_age=None,
-                 resume_file=None, threads=None, tracelog=None):
+                 resume_file=None, threads=None, tracelog=None,
+                 tracelog_key='tracelog'):
         history = int(history)
         self.app = app
         self.history = history
@@ -76,11 +77,18 @@
                     info(no_message_format, code, rno, now())
             tracelog = log
 
+            class ApplicationTraceLog(object):
+
+                def __init__(self, rno):
+                    self.rno = rno
+
+                def log(self, msg=None, code='-'):
+                    log(self.rno, code, msg)
+
+
             def call_app_w_tracelog(rno, env):
                 log(rno, 'C')
-                env['tracelog'] = (
-                    lambda code, message=None: log(rno, code, message)
-                    )
+                env[tracelog_key] = ApplicationTraceLog(rno)
                 response, body = call_app(rno, env)
                 content_length = [v for (h, v) in response[1]
                                   if h.lower() == 'content-length']

Modified: zc.resumelb/trunk/src/zc/resumelb/worker.test
===================================================================
--- zc.resumelb/trunk/src/zc/resumelb/worker.test	2012-03-20 16:03:35 UTC (rev 124650)
+++ zc.resumelb/trunk/src/zc/resumelb/worker.test	2012-03-20 16:03:41 UTC (rev 124651)
@@ -565,6 +565,7 @@
     >>> read_message(worker_socket) # doctest: +ELLIPSIS
     I 1 2012-02-05 01:02:03.030456
     T 2 2012-02-05 01:02:03.030456 test
+    - 2 2012-02-05 01:02:03.030456 test2
     A 2 2012-02-05 01:02:03.030456 200 OK 12
     C 1 2012-02-05 01:02:03.030456
     E 2 2012-02-05 01:02:03.030456
@@ -575,6 +576,7 @@
     (2, '')
     >>> read_message(worker_socket) # doctest: +ELLIPSIS
     T 1 2012-02-05 01:02:03.030456 test
+    - 1 2012-02-05 01:02:03.030456 test2
     A 1 2012-02-05 01:02:03.030456 200 OK 12
     E 1 2012-02-05 01:02:03.030456
     (1, ('200 OK', [...('Content-Length', '12')]))