Commit 48fc0133 authored by Toby Dickenson's avatar Toby Dickenson

merge change from ZEO2-branch; fix bug that caused exceptions log entries to be mangled

parent e8a96ddd
...@@ -169,7 +169,7 @@ class Connection(smac.SizedMessageAsyncConnection): ...@@ -169,7 +169,7 @@ class Connection(smac.SizedMessageAsyncConnection):
ret = meth(*args) ret = meth(*args)
except Exception, msg: except Exception, msg:
error = sys.exc_info()[:2] error = sys.exc_info()[:2]
log("%s() raised exception: %s" % (name, msg), zLOG.ERROR, error) log("%s() raised exception: %s" % (name, msg), zLOG.ERROR, error=sys.exc_info())
return self.return_error(msgid, flags, error[0], error[1]) return self.return_error(msgid, flags, error[0], error[1])
if flags & ASYNC: if flags & ASYNC:
......
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