[Zope3-checkins] CVS: Zope3/lib/python/Zope/Server/FTP - CommonFTPActivityLogger.py:1.3

[Steve Alexander]

Update of /cvs-repository/Zope3/lib/python/Zope/Server/FTP
In directory cvs.zope.org:/tmp/cvs-serv31354/lib/python/Zope/Server/FTP

Modified Files:
	CommonFTPActivityLogger.py 
Log Message:
various changes and a small refactoring to the Logger package.
This is the package that logs requests, typically in zope2 to a
Z2.log, and in zope3 by default to stdout.


=== Zope3/lib/python/Zope/Server/FTP/CommonFTPActivityLogger.py 1.2 => 1.3 ===
--- Zope3/lib/python/Zope/Server/FTP/CommonFTPActivityLogger.py:1.2	Mon Jun 10 19:29:35 2002
+++ Zope3/lib/python/Zope/Server/FTP/CommonFTPActivityLogger.py	Fri Nov  8 09:34:58 2002
@@ -16,7 +16,6 @@
 $Id$
 """
 
-
 import time
 import sys
 
@@ -24,7 +23,6 @@
 from Zope.Server.Logger.ResolvingLogger import ResolvingLogger
 from Zope.Server.Logger.UnresolvingLogger import UnresolvingLogger
 
-
 class CommonFTPActivityLogger:
     """Outputs hits in common HTTP log format.
     """
@@ -47,10 +45,10 @@
 
         now = time.localtime(time.time())
 
-        message = '%s [%s] "%s %s"' %(task.channel.username,
-                                      time.strftime('%Y/%m/%d %H:%M', now),
-                                      task.m_name[4:].upper(),
-                                      task.channel.cwd,
-                                      )
+        message = '%s [%s] "%s %s"' % (task.channel.username,
+                                       time.strftime('%Y/%m/%d %H:%M', now),
+                                       task.m_name[4:].upper(),
+                                       task.channel.cwd,
+                                       )
 
-        self.output.log('127.0.0.1', message)
+        self.output.logRequest('127.0.0.1', message)