log more data

zopefoundation · Nov 14, 2016 · a5a24c0 · a5a24c0
1 parent 189ce83
commit a5a24c0
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/cipher/session/session.py b/src/cipher/session/session.py
@@ -93,15 +93,18 @@ def _p_resolveConflict(self, old, committed, new):
         for k, v in new['data'].items():
             if k in c_new:
                 try:
+                    verror = False
                     rdata_k = result_data[k]
                     neq = (v != rdata_k)
                     # value is not the same -> raise ConflictError
                 except ValueError:
                     # uncomparable PersistentReferences -> raise ConflictError
                     neq = True
+                    verror = True
                 if neq:
                     # log everything, debugging ConflictResolution is hard
-                    formatExtraData(extra, k=k, v=v, c_new=c_new, result=result)
+                    formatExtraData(extra, k=k, v=v, c_new=c_new, result=result,
+                                    rdata_k=rdata_k, verror=verror)
                     LOG.error("Conflicting insert", extra=extra)
                     raise ConflictError("Conflicting insert")
             if k in result_data: