[Checkins] SVN: zc.zservertracelog/branches/alex-extensions-2/src/zc/zservertracelog/ - added function to get the tracelog from a request.

[Alex Smith]

Log message for revision 91907:
  
  - added function to get the tracelog from a request.
  - renamed tracelog in CGI environment.
  

Changed:
  U   zc.zservertracelog/branches/alex-extensions-2/src/zc/zservertracelog/README.txt
  U   zc.zservertracelog/branches/alex-extensions-2/src/zc/zservertracelog/configure.zcml
  U   zc.zservertracelog/branches/alex-extensions-2/src/zc/zservertracelog/tracelog.py

-=-
Modified: zc.zservertracelog/branches/alex-extensions-2/src/zc/zservertracelog/README.txt
===================================================================
--- zc.zservertracelog/branches/alex-extensions-2/src/zc/zservertracelog/README.txt	2008-10-08 14:07:39 UTC (rev 91906)
+++ zc.zservertracelog/branches/alex-extensions-2/src/zc/zservertracelog/README.txt	2008-10-08 14:40:41 UTC (rev 91907)
@@ -184,7 +184,7 @@
 Here is an example application that adds a custom entry to the tracelog.
 
     >>> def noisy_app(environ, start_response):
-    ...     logger = environ['zc.zservertracelog.TraceLog']
+    ...     logger = environ['zc.zservertracelog.interfaces.ITraceLog']
     ...     logger.log('beep! beep!')
     >>> faux_app.app_hook = noisy_app
 

Modified: zc.zservertracelog/branches/alex-extensions-2/src/zc/zservertracelog/configure.zcml
===================================================================
--- zc.zservertracelog/branches/alex-extensions-2/src/zc/zservertracelog/configure.zcml	2008-10-08 14:07:39 UTC (rev 91906)
+++ zc.zservertracelog/branches/alex-extensions-2/src/zc/zservertracelog/configure.zcml	2008-10-08 14:40:41 UTC (rev 91907)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <configure xmlns="http://namespaces.zope.org/zope">
 
   <utility
@@ -12,6 +13,8 @@
       provides="zope.app.server.servertype.IServerType"
       />
 
+  <adapter factory="zc.zservertracelog.tracelog.get" />
+
   <subscriber handler=".tracelog.started" />
 
 </configure>

Modified: zc.zservertracelog/branches/alex-extensions-2/src/zc/zservertracelog/tracelog.py
===================================================================
--- zc.zservertracelog/branches/alex-extensions-2/src/zc/zservertracelog/tracelog.py	2008-10-08 14:07:39 UTC (rev 91906)
+++ zc.zservertracelog/branches/alex-extensions-2/src/zc/zservertracelog/tracelog.py	2008-10-08 14:40:41 UTC (rev 91907)
@@ -44,6 +44,12 @@
     tracelog.info(entry)
 
 
+ at zope.component.adapter(zope.publisher.interfaces.IRequest)
+ at zope.interface.implementer(zc.zservertracelog.interfaces.ITraceLog)
+def get(request):
+    return request['zc.zservertracelog.interfaces.ITraceLog']
+
+
 class TraceLog(object):
     zope.interface.implements(zc.zservertracelog.interfaces.ITraceLog)
 
@@ -93,7 +99,7 @@
         _log(cid, 'C')
         env = task.getCGIEnvironment()
         env['wsgi.input'] = task.request_data.getBodyStream()
-        env['zc.zservertracelog.TraceLog'] = TraceLog(cid)
+        env['zc.zservertracelog.interfaces.ITraceLog'] = TraceLog(cid)
 
         def start_response(status, headers):
             # Prepare the headers for output
@@ -112,7 +118,6 @@
             _log(cid, 'E')
             raise
         else:
-            del env['zc.zservertracelog.TraceLog']
             accumulated_headers = getattr(task, 'accumulated_headers') or ()
             length = [h.split(': ')[1].strip()
                       for h in accumulated_headers