Skip to content

Z
ZODB
Commit fdfd53cd authored by Adam Groszer's avatar Adam Groszer
Browse files
Options

log ConflictError details

parent 5e04c32f
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
src/ZODB/ConflictResolution.py
View file @ fdfd53cd
...@@ -294,8 +294,8 @@ def tryToResolveConflict(self, oid, committedSerial, oldSerial, newpickle, ...@@ -294,8 +294,8 @@ def tryToResolveConflict(self, oid, committedSerial, oldSerial, newpickle,
pickler.dump(meta) pickler.dump(meta)
pickler.dump(resolved) pickler.dump(resolved)
return self._crs_transform_record_data(file.getvalue()) return self._crs_transform_record_data(file.getvalue())
except (ConflictError, BadClassName): except (ConflictError, BadClassName), e:
pass logger.exception(str(e))
except: except:
# If anything else went wrong, catch it here and avoid passing an # If anything else went wrong, catch it here and avoid passing an
# arbitrary exception back to the client. The error here will mask # arbitrary exception back to the client. The error here will mask
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7