[Zodb-checkins] CVS: Packages/ZEO - StorageServer.py:1.21.4.4

[jeremy@digicool.com]

Update of /cvs-repository/Packages/ZEO
In directory korak:/tmp/cvs-serv8514

Modified Files:
      Tag: ZEO-ZRPC-Dev
	StorageServer.py 
Log Message:
Sundry changes to StorageServer

Rename closed() to close().
Fix typos.
Add some logging.




--- Updated File StorageServer.py in package Packages/ZEO --
--- StorageServer.py	2001/03/30 22:55:22	1.21.4.3
+++ StorageServer.py	2001/04/18 20:53:37	1.21.4.4
@@ -58,7 +58,7 @@
             else:
                 p.client.info(info)
 
-    def closed(self, conn):
+    def close(self, conn):
         # called when conn is closed
         # way too inefficient
         removed = 0
@@ -198,15 +198,17 @@
             newserial = self.__storage.store(oid, serial, data, version, t)
         except TransactionError, v:
             # This is a normal transaction error such as a conflict error
-            # or a version lock or conflict error. It doen't need to be
+            # or a version lock or conflict error. It doesn't need to be
             # logged.
+            log("transaction error: %s" % repr(v))
             newserial = v
         except:
             # all errors need to be serialized to prevent unexpected
             # returns, which would screw up the return handling.
             # IOW, Anything that ends up here is evil enough to be logged.
             error = sys.exc_info()
-            log('store error: %s: %s' % (error[0], error[1]))
+            log('store error: %s: %s' % (error[0], error[1]).
+                zLOG.ERROR)
             newserial = sys.exc_info()[1]
         else:
             if serial != '\0\0\0\0\0\0\0\0':
@@ -215,6 +217,8 @@
         try:
             nil = dump(newserial, 1)
         except:
+            log("couldn't pickle newserial: %s" % repr(newserial),
+                zLOG.ERROR)
             dump('', 1) # clear pickler
             r = StorageServerError("Couldn't pickle exception %s" % \
                                    `newserial`)