Commit e8f7894e authored by Godefroid Chapelle's avatar Godefroid Chapelle

also notify DatabaseOpenedWithRoot

parent 51264c45
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
from zope.component import queryMultiAdapter from zope.component import queryMultiAdapter
from zope.event import notify from zope.event import notify
from zope.processlifetime import DatabaseOpened from zope.processlifetime import DatabaseOpened
from zope.processlifetime import DatabaseOpenedWithRoot
from AccessControl.SecurityManagement import newSecurityManager from AccessControl.SecurityManagement import newSecurityManager
from AccessControl.SecurityManagement import noSecurityManager from AccessControl.SecurityManagement import noSecurityManager
...@@ -134,6 +135,8 @@ def startup(): ...@@ -134,6 +135,8 @@ def startup():
global startup_time global startup_time
startup_time = asctime() startup_time = asctime()
notify(DatabaseOpenedWithRoot(DB))
Zope2.zpublisher_transactions_manager = TransactionsManager() Zope2.zpublisher_transactions_manager = TransactionsManager()
Zope2.zpublisher_exception_hook = zpublisher_exception_hook Zope2.zpublisher_exception_hook = zpublisher_exception_hook
Zope2.zpublisher_validated_hook = validated_hook Zope2.zpublisher_validated_hook = validated_hook
...@@ -206,7 +209,7 @@ class ZPublisherExceptionHook: ...@@ -206,7 +209,7 @@ class ZPublisherExceptionHook:
else: else:
error_log_url = log.raising((t, v, traceback)) error_log_url = log.raising((t, v, traceback))
if (REQUEST is None or if (REQUEST is None or
(getattr(REQUEST.get('RESPONSE', None), '_error_format', '') (getattr(REQUEST.get('RESPONSE', None), '_error_format', '')
!= 'text/html')): != 'text/html')):
raise t, v, traceback raise t, v, traceback
...@@ -264,8 +267,8 @@ class ZPublisherExceptionHook: ...@@ -264,8 +267,8 @@ class ZPublisherExceptionHook:
REQUEST['AUTHENTICATED_USER'] = AccessControl.User.nobody REQUEST['AUTHENTICATED_USER'] = AccessControl.User.nobody
try: try:
result = f(client, REQUEST, t, v, result = f(client, REQUEST, t, v,
traceback, traceback,
error_log_url=error_log_url) error_log_url=error_log_url)
if result is not None: if result is not None:
t, v, traceback = result t, v, traceback = result
......
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