Commit c8a8c175 authored by matt@zope.com's avatar matt@zope.com

Lower priority of ConflictErrors so they dont cause undue alarm.

parent 5fd1da4e
...@@ -159,7 +159,7 @@ sys.modules['Main']=sys.modules['Zope'] ...@@ -159,7 +159,7 @@ sys.modules['Main']=sys.modules['Zope']
import ZODB.POSException, ZPublisher, string, ZPublisher import ZODB.POSException, ZPublisher, string, ZPublisher
import ExtensionClass import ExtensionClass
from zLOG import LOG, INFO, WARNING from zLOG import LOG, INFO, WARNING, BLATHER
def debug(*args, **kw): def debug(*args, **kw):
return apply(ZPublisher.test,('Zope',)+args, kw) return apply(ZPublisher.test,('Zope',)+args, kw)
...@@ -186,7 +186,7 @@ def zpublisher_exception_hook( ...@@ -186,7 +186,7 @@ def zpublisher_exception_hook(
# do this by releasing the hold on it. There should be # do this by releasing the hold on it. There should be
# some sane protocol for this, but for now we'll use # some sane protocol for this, but for now we'll use
# brute force: # brute force:
LOG('Z2 CONFLICT', INFO, LOG('Z2 CONFLICT', BLATHER,
'Competing writes at, %s' % REQUEST.get('PATH_INFO', ''), 'Competing writes at, %s' % REQUEST.get('PATH_INFO', ''),
error=sys.exc_info()) error=sys.exc_info())
raise ZPublisher.Retry(t, v, traceback) raise ZPublisher.Retry(t, v, traceback)
......
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