[MERGE] forward port branch saas-6 up to 96650373f8

This commit is contained in:
Christophe Simonis
2017-05-05 15:34:30 +02:00
+1 -1
View File
@@ -103,7 +103,6 @@ class ir_cron(osv.osv):
"""
cr.rollback()
_logger.exception("Call of self.pool.get('%s').%s(cr, uid, *%r) failed in Job %s" % (model_name, method_name, args, job_id))
def _callback(self, cr, uid, model_name, method_name, args, job_id):
""" Run the method associated to a given job
@@ -138,6 +137,7 @@ class ir_cron(osv.osv):
msg = "Model `%s` does not exist." % model_name
_logger.warning(msg)
except Exception, e:
_logger.exception("Call of self.pool.get('%s').%s(cr, uid, *%r) failed in Job %s" % (model_name, method_name, args, job_id))
self._handle_callback_exception(cr, uid, model_name, method_name, args, job_id, e)
def _process_job(self, job_cr, job, cron_cr):