[Zope-Checkins] CVS: ZODB3/ZEO - StorageServer.py:1.98.2.4

Jeremy Hylton jeremy at zope.com
Thu Sep 4 19:06:39 EDT 2003


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

Modified Files:
      Tag: ZODB3-3_2-branch
	StorageServer.py 
Log Message:
Fiddle the log message to have better grammar.


=== ZODB3/ZEO/StorageServer.py 1.98.2.3 => 1.98.2.4 ===
--- ZODB3/ZEO/StorageServer.py:1.98.2.3	Thu Sep  4 18:01:24 2003
+++ ZODB3/ZEO/StorageServer.py	Thu Sep  4 18:06:39 2003
@@ -564,8 +564,12 @@
 
     def _restart(self, delay=None):
         # Restart when the storage lock is available.
-        self.log("Preparing to commit transaction: %d objects, %d bytes" %
-                 (self.txnlog.stores, self.txnlog.size()), level=zLOG.BLATHER)
+        if self.txnlog.stores == 1:
+            template = "Preparing to commit transaction: %d object, %d bytes"
+        else:
+            template = "Preparing to commit transaction: %d objects, %d bytes"
+        self.log(template % (self.txnlog.stores, self.txnlog.size()),
+                 level=zLOG.BLATHER)
         self._tpc_begin(self.transaction, self.tid, self.status)
         loads, loader = self.txnlog.get_loader()
         for i in range(loads):




More information about the Zope-Checkins mailing list