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

[Jeremy Hylton]

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

Modified Files:
	StorageServer.py 
Log Message:
Fix logging in store().

The ImmediateCommitStrategy storage is not a ZEOStorage, but a FileStorage.



=== ZODB3/ZEO/StorageServer.py 1.52 => 1.53 ===
--- ZODB3/ZEO/StorageServer.py:1.52	Thu Aug 29 17:59:19 2002
+++ ZODB3/ZEO/StorageServer.py	Thu Aug 29 18:05:27 2002
@@ -483,8 +483,8 @@
         except Exception:
             # Unexpected storage errors are logged and passed to the client
             exc_info = sys.exc_info()
-            self.storage._log("store error: %s, %s" % exc_info[:2],
-                              zLOG.ERROR, error=exc_info)
+            log("store error: %s, %s" % exc_info[:2],
+                zLOG.ERROR, error=exc_info)
             newserial = exc_info[1]
             del exc_info
         else:
@@ -495,7 +495,7 @@
             dump(newserial, 1)
         except:
             msg = "Couldn't pickle storage exception: %s" % repr(newserial)
-            self.storage._log(msg, zLOG.ERROR)
+            log(msg, zLOG.ERROR)
             dump('', 1) # clear pickler
             r = StorageServerError(msg)
             newserial = r