Skip to content
Snippets Groups Projects
Commit 96650373 authored by Christophe Simonis's avatar Christophe Simonis
Browse files

[MERGE] forward port branch 8.0 up to e3081dbb

parents 671864e7 e3081dbb
No related branches found
No related tags found
No related merge requests found
...@@ -113,7 +113,6 @@ class ir_cron(osv.osv): ...@@ -113,7 +113,6 @@ class ir_cron(osv.osv):
""" """
cr.rollback() 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): def _callback(self, cr, uid, model_name, method_name, args, job_id):
""" Run the method associated to a given job """ Run the method associated to a given job
...@@ -148,6 +147,7 @@ class ir_cron(osv.osv): ...@@ -148,6 +147,7 @@ class ir_cron(osv.osv):
msg = "Model `%s` does not exist." % model_name msg = "Model `%s` does not exist." % model_name
_logger.warning(msg) _logger.warning(msg)
except Exception, e: 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) self._handle_callback_exception(cr, uid, model_name, method_name, args, job_id, e)
def _process_job(self, job_cr, job, cron_cr): def _process_job(self, job_cr, job, cron_cr):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment