demote LOG.error("Conflicting insert", extra=extra) to warn

zopefoundation · Nov 17, 2016 · 6ada990 · 6ada990
1 parent 24338b7
commit 6ada990
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/setup.py b/setup.py
@@ -37,7 +37,7 @@ def alltests():
 
 setup(
     name='cipher.session',
-    version='2.1.1.dev6',
+    version='2.1.1.dev7',
     url="http://pypi.python.org/pypi/cipher.session/",
     author='Zope Foundation and Contributors',
     author_email='zope-dev@zope.org',

diff --git a/src/cipher/session/session.py b/src/cipher/session/session.py
@@ -105,7 +105,7 @@ def _p_resolveConflict(self, old, committed, new):
                     # log everything, debugging ConflictResolution is hard
                     formatExtraData(extra, k=k, v=v, c_new=c_new, result=result,
                                     rdata_k=rdata_k, verror=verror)
-                    LOG.error("Conflicting insert", extra=extra)
+                    LOG.warn("Conflicting insert", extra=extra)
                     raise ConflictError("Conflicting insert")
             if k in result_data:
                 continue