Skip to content

Commit

Permalink
demoting log entry to debug
Browse files Browse the repository at this point in the history
  • Loading branch information
agroszer committed May 21, 2015
1 parent bf188f4 commit 33d8ed6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/ZODB/ConflictResolution.py
Expand Up @@ -295,7 +295,7 @@ def tryToResolveConflict(self, oid, committedSerial, oldSerial, newpickle,
pickler.dump(resolved)
return self._crs_transform_record_data(file.getvalue())
except (ConflictError, BadClassName) as e:
logger.exception(str(e))
logger.debug(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
Expand Down

0 comments on commit 33d8ed6

Please sign in to comment.