[Zodb-checkins] CVS: ZODB3/ZEO - StorageServer.py:1.71

[Jeremy Hylton]

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

Modified Files:
	StorageServer.py 
Log Message:
Revise ZSS logging.

Use the ZEO storage id rather than the ZODB storage name.  The latter
is usually a long path to a file, which is relatively uninteresting.



=== ZODB3/ZEO/StorageServer.py 1.70 => 1.71 ===
--- ZODB3/ZEO/StorageServer.py:1.70	Thu Sep 26 13:01:35 2002
+++ ZODB3/ZEO/StorageServer.py	Tue Oct  1 12:45:13 2002
@@ -149,10 +149,7 @@
         return "<%s %X trans=%s s_trans=%s>" % (name, id(self), tid, stid)
 
     def log(self, msg, level=zLOG.INFO, error=None):
-        name = getattr(self.storage, '__name__', None)
-        if name is None:
-            name = str(self.storage)
-        zLOG.LOG("%s:%s" % (_label, name), level, msg, error=error)
+        zLOG.LOG("%s:%s" % (_label, self.storage_id), level, msg, error=error)
 
     def setup_delegation(self):
         """Delegate several methods to the storage"""
@@ -188,7 +185,6 @@
 
         This method must be the first one called by the client.
         """
-        self.log("register(%r, %s)" % (storage_id, read_only))
         if self.storage is not None:
             log("duplicate register() call")
             raise ValueError, "duplicate register() call"
@@ -205,7 +201,6 @@
         self.storage = storage
         self.setup_delegation()
         self.server.register_connection(storage_id, self)
-        self.log("registered storage %r: %s" % (storage_id, storage))
 
     def get_info(self):
         return {'length': len(self.storage),