Commit 3366502b authored by Jeremy Hylton's avatar Jeremy Hylton

Fix logging in store().

The ImmediateCommitStrategy storage is not a ZEOStorage, but a FileStorage.
parent 37a69f51
...@@ -483,8 +483,8 @@ class ImmediateCommitStrategy: ...@@ -483,8 +483,8 @@ class ImmediateCommitStrategy:
except Exception: except Exception:
# Unexpected storage errors are logged and passed to the client # Unexpected storage errors are logged and passed to the client
exc_info = sys.exc_info() exc_info = sys.exc_info()
self.storage._log("store error: %s, %s" % exc_info[:2], log("store error: %s, %s" % exc_info[:2],
zLOG.ERROR, error=exc_info) zLOG.ERROR, error=exc_info)
newserial = exc_info[1] newserial = exc_info[1]
del exc_info del exc_info
else: else:
...@@ -495,7 +495,7 @@ class ImmediateCommitStrategy: ...@@ -495,7 +495,7 @@ class ImmediateCommitStrategy:
dump(newserial, 1) dump(newserial, 1)
except: except:
msg = "Couldn't pickle storage exception: %s" % repr(newserial) msg = "Couldn't pickle storage exception: %s" % repr(newserial)
self.storage._log(msg, zLOG.ERROR) log(msg, zLOG.ERROR)
dump('', 1) # clear pickler dump('', 1) # clear pickler
r = StorageServerError(msg) r = StorageServerError(msg)
newserial = r newserial = r
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment