cubicweb: comparison server/session.py

equal deleted inserted replaced

-:31327bd26931
+:91e63306e277
-# copyright 2003-2014 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# copyright 2003-2015 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
 # contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
 #
 # This file is part of CubicWeb.
 #
 # CubicWeb is free software: you can redistribute it and/or modify it under the
 Holds all connection related data
 Database connection resources:
-:attr:`running_dbapi_query`, boolean flag telling if the executing query
+:attr:`hooks_in_progress`, boolean flag telling if the executing
-is coming from a dbapi connection or is a query from within the repository
+query is coming from a repoapi connection or is a query from
+within the repository (e.g. started by hooks)
 :attr:`cnxset`, the connections set to use to execute queries on sources.
 If the transaction is read only, the connection set may be freed between
 actual queries. This allows multiple connections with a reasonably low
 connection set pool size.  Control mechanism is detailed below.
 read/write security is currently activated.
 """
 is_request = False
+hooks_in_progress = False
 mode = 'read'
 def __init__(self, session, cnxid=None, session_handled=False):
 # using super(Connection, self) confuse some test hack
 RequestSessionBase.__init__(self, session.vreg)
 #: connection set used to execute queries on sources
 self._cnxset = None
 #: CnxSetTracker used to report cnxset usage
 self._cnxset_tracker = CnxSetTracker()
-#: is this connection from a client or internal to the repo
-self.running_dbapi_query = True
 # internal (root) session
 self.is_internal_session = isinstance(session.user, InternalManager)
 #: dict containing arbitrary data cleared at the end of the transaction
 self.transaction_data = {}
 self.set_language(self.user.prefered_language())
 else:
 self._set_user(session.user)
-# live cycle handling ####################################################
+# life cycle handling ####################################################
 def __enter__(self):
 assert self._open is None # first opening
 self._open = True
 return self
 assert self._open # actually already open
 assert self._cnxset_count == 0
 self.rollback()
 self._open = False
+@contextmanager
+def running_hooks_ops(self):
+"""this context manager should be called whenever hooks or operations
+are about to be run (but after hook selection)
+It will help the undo logic record pertinent metadata or some
+hooks to run (or not) depending on who/what issued the query.
+"""
+prevmode = self.hooks_in_progress
+self.hooks_in_progress = True
+yield
+self.hooks_in_progress = prevmode
 # shared data handling ###################################################
 @property
 def data(self):
 return self._read_security
 @read_security.setter
 @_open_only
 def read_security(self, activated):
-oldmode = self._read_security
 self._read_security = activated
-# running_dbapi_query used to detect hooks triggered by a 'dbapi' query
-# (eg not issued on the session). This is tricky since we the execution
-# model of a (write) user query is:
-#
-# repository.execute (security enabled)
-#  \-> querier.execute
-#       \-> repo.glob_xxx (add/update/delete entity/relation)
-#            \-> deactivate security before calling hooks
-#                 \-> WE WANT TO CHECK QUERY NATURE HERE
-#                      \-> potentially, other calls to querier.execute
-#
-# so we can't rely on simply checking session.read_security, but
-# recalling the first transition from DEFAULT_SECURITY to something
-# else (False actually) is not perfect but should be enough
-#
-# also reset running_dbapi_query to true when we go back to
-# DEFAULT_SECURITY
-self.running_dbapi_query = (oldmode is DEFAULT_SECURITY
-or activated is DEFAULT_SECURITY)
 # undo support ############################################################
 @_open_only
 def ertype_supports_undo(self, ertype):
 processed = []
 self.commit_state = 'precommit'
 if debug:
 print self.commit_state, '*' * 20
 try:
-while self.pending_operations:
+with self.running_hooks_ops():
-operation = self.pending_operations.pop(0)
+while self.pending_operations:
-operation.processed = 'precommit'
+operation = self.pending_operations.pop(0)
-processed.append(operation)
+operation.processed = 'precommit'
-if debug:
+processed.append(operation)
-print operation
+if debug:
-operation.handle_event('precommit_event')
+print operation
+operation.handle_event('precommit_event')
 self.pending_operations[:] = processed
 self.debug('precommit transaction %s done', self.connectionid)
 except BaseException:
 # if error on [pre]commit:
 #
 # instead of having to implements rollback, revertprecommit
 # and revertcommit, that will be enough in mont case.
 operation.failed = True
 if debug:
 print self.commit_state, '*' * 20
-for operation in reversed(processed):
+with self.running_hooks_ops():
-if debug:
+for operation in reversed(processed):
-print operation
+if debug:
-try:
+print operation
-operation.handle_event('revertprecommit_event')
+try:
-except BaseException:
+operation.handle_event('revertprecommit_event')
-self.critical('error while reverting precommit',
+except BaseException:
-exc_info=True)
+self.critical('error while reverting precommit',
+exc_info=True)
 # XXX use slice notation since self.pending_operations is a
 # read-only property.
 self.pending_operations[:] = processed + self.pending_operations
 self.rollback(free_cnxset)
 raise
 self.cnxset.commit()
 self.commit_state = 'postcommit'
 if debug:
 print self.commit_state, '*' * 20
-while self.pending_operations:
+with self.running_hooks_ops():
-operation = self.pending_operations.pop(0)
+while self.pending_operations:
-if debug:
+operation = self.pending_operations.pop(0)
-print operation
+if debug:
-operation.processed = 'postcommit'
+print operation
-try:
+operation.processed = 'postcommit'
-operation.handle_event('postcommit_event')
+try:
-except BaseException:
+operation.handle_event('postcommit_event')
-self.critical('error while postcommit',
+except BaseException:
-exc_info=sys.exc_info())
+self.critical('error while postcommit',
+exc_info=sys.exc_info())
 self.debug('postcommit transaction %s done', self.connectionid)
 return self.transaction_uuid(set=False)
 finally:
 self._session_timestamp.touch()
 if free_cnxset:

changeset 10351	91e63306e277
parent 10347	52a976c5d27a
child 10352	bab2befaac9b