[Zodb-checkins] CVS: ZODB3/ZEO/zrpc - smac.py:1.28

[Guido van Rossum]

Update of /cvs-repository/ZODB3/ZEO/zrpc
In directory cvs.zope.org:/tmp/cvs-serv32233

Modified Files:
	smac.py 
Log Message:
Use the zrpc.log module's log() method so the process identity is
logged with the message_output.


=== ZODB3/ZEO/zrpc/smac.py 1.27 => 1.28 ===
--- ZODB3/ZEO/zrpc/smac.py:1.27	Mon Sep 16 12:57:11 2002
+++ ZODB3/ZEO/zrpc/smac.py	Fri Sep 27 15:14:16 2002
@@ -18,9 +18,11 @@
 
 import asyncore, struct
 from ZEO.Exceptions import Disconnected
-from zLOG import LOG, TRACE, ERROR, INFO, BLATHER
+import zLOG
 from types import StringType
 
+from ZEO.zrpc.log import log
+
 import socket, errno
 
 # Use the dictionary to make sure we get the minimum number of errno
@@ -60,7 +62,7 @@
         if debug is not None:
             self._debug = debug
         elif not hasattr(self, '_debug'):
-            self._debug = __debug__ and 'smac'
+            self._debug = __debug__
         self.__state = None
         self.__inp = None # None, a single String, or a list
         self.__input_len = 0
@@ -179,7 +181,7 @@
                     m = message[:40]+' ...'
                 else:
                     m = message
-                LOG(self._debug, TRACE, 'message_output %s' % `m`)
+                log('smac message_output %s' % `m`, level=zLOG.TRACE)
 
         if self.__closed:
             raise Disconnected, (