log ConflictError details

fdfd53cd · Adam Groszer · 5e04c32f · fdfd53cd
Commit fdfd53cd authored Feb 11, 2015 by Adam Groszer
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

src/ZODB/ConflictResolution.py src/ZODB/ConflictResolution.py +2 -2

No files found.
--- a/src/ZODB/ConflictResolution.py
+++ b/src/ZODB/ConflictResolution.py
@@ -294,8 +294,8 @@ def tryToResolveConflict(self, oid, committedSerial, oldSerial, newpickle,
        pickler.dump(meta)
        pickler.dump(resolved)
        return self._crs_transform_record_data(file.getvalue())
-    except (ConflictError, BadClassName):
+    except (ConflictError, BadClassName), e:
-        pass
+        logger.exception(str(e))
    except:
        # If anything else went wrong, catch it here and avoid passing an
        # arbitrary exception back to the client.  The error here will mask