Reviewers: ,
Please review this at http://codereview.tryton.org/141004/
Affected files:
M trytond/protocols/dispatcher.py
Index: trytond/protocols/dispatcher.py
===================================================================
--- a/trytond/protocols/dispatcher.py
+++ b/trytond/protocols/dispatcher.py
@@ -13,7 +13,7 @@
import pydoc
from trytond.pool import Pool
from trytond import security
-from trytond.backend import Database
+from trytond.backend import Database, DatabaseOperationalError
from trytond.config import CONFIG
from trytond.version import VERSION
from trytond.monitor import monitor
@@ -138,39 +138,45 @@
readonly = not obj._rpc[method]
- with Transaction().start(database_name, user,
- readonly=readonly) as transaction:
- try:
+ for count in range(5, -1, -1):
+ with Transaction().start(database_name, user,
+ readonly=readonly) as transaction:
+ try:
- if 'context' in kargs:
- context = kargs.pop('context')
- else:
- args = list(args)
- context = args.pop()
- if '_timestamp' in context:
- transaction.timestamp = context['_timestamp']
- del context['_timestamp']
- transaction.context = context
- res = getattr(obj, method)(*args, **kargs)
- if not readonly:
- transaction.cursor.commit()
- except Exception, exception:
- if CONFIG['verbose'] and not isinstance(exception, (
- NotLogged, ConcurrencyException, UserError,
- UserWarning)):
- tb_s = reduce(lambda x, y: x + y,
- traceback.format_exception(*sys.exc_info()))
- logger = logging.getLogger('dispatcher')
- logger.error('Exception calling method %s on ' \
- '%s %s from %s@%s:%d/%s:\n' % \
- (method, object_type, object_name, user, host,
port,
- database_name) +
tb_s.decode('utf-8', 'ignore'))
- transaction.cursor.rollback()
- raise
- if not (object_name == 'res.request' and method == 'request_get'):
- user.reset_timestamp()
- Cache.resets(database_name)
- return res
+ args_without_context = list(args)
+ if 'context' in kargs:
+ context = kargs.pop('context')
+ else:
+ context = args_without_context.pop()
+ if '_timestamp' in context:
+ transaction.timestamp = context['_timestamp']
+ del context['_timestamp']
+ transaction.context = context
+ res = getattr(obj, method)(*args_without_context, **kargs)
+ if not readonly:
+ transaction.cursor.commit()
+ except DatabaseOperationalError, exception:
+ transaction.cursor.rollback()
+ if count and not readonly:
+ continue
+ raise
+ except Exception, exception:
+ if CONFIG['verbose'] and not isinstance(exception, (
+ NotLogged, ConcurrencyException, UserError,
+ UserWarning)):
+ tb_s = reduce(lambda x, y: x + y,
+ traceback.format_exception(*sys.exc_info()))
+ logger = logging.getLogger('dispatcher')
+ logger.error('Exception calling method %s on ' \
+ '%s %s from %s@%s:%d/%s:\n' % \
+ (method, object_type, object_name, user, host,
port,
+ database_name) +
tb_s.decode('utf-8', 'ignore'))
+ transaction.cursor.rollback()
+ raise
+ if not (object_name == 'res.request' and method == 'request_get'):
+ user.reset_timestamp()
+ Cache.resets(database_name)
+ return res
def create(database_name, password, lang, admin_password):
'''
--
[email protected] mailing list
