[Moin-devel] CVS: MoinMoin eventlog.py,1.3,1.4

[J?rgen Hermann]

Update of /cvsroot/moin/MoinMoin
In directory usw-pr-cvs1:/tmp/cvs-serv13327/MoinMoin

Modified Files:
	eventlog.py 
Log Message:
Add HTTP info to event log


Index: eventlog.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/eventlog.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** eventlog.py	2002/02/02 02:35:19	1.3
--- eventlog.py	2002/02/06 10:42:20	1.4
***************
*** 34,43 ****
          self._logfile.flush()
  
!     def add(self, eventtype, values={}):
          """ Write an event of type `eventtype, with optional key/value
              pairs appended (i.e. you have to pass a dict).
          """
          kvpairs = ""
!         for key, val in values.items():
              if kvpairs: kvpairs = kvpairs + "&"
              kvpairs = "%s%s=%s" % (kvpairs, urllib.quote(key), urllib.quote(val))
--- 34,48 ----
          self._logfile.flush()
  
!     def add(self, eventtype, values={}, add_http_info=1):
          """ Write an event of type `eventtype, with optional key/value
              pairs appended (i.e. you have to pass a dict).
          """
+         kvlist = values.items()
+         if add_http_info:
+             for key in ['REMOTE_ADDR', 'HTTP_USER_AGENT', 'HTTP_REFERER']:
+                 val = os.environ.get(key, '')
+                 if val: kvlist.append((key, val))
          kvpairs = ""
!         for key, val in kvlist:
              if kvpairs: kvpairs = kvpairs + "&"
              kvpairs = "%s%s=%s" % (kvpairs, urllib.quote(key), urllib.quote(val))