[UPD] base_bg: Update error handling to accept string type and improve timeout notification

closes #329

Signed-off-by: Nicolas Mac Rouillon (ADV) <nmr@adhoc.inc>

Author: joa-adhoc

base_bg/models/bg_job.py

@@ -180,7 +180,7 @@ def run(self):
             self._handle_job_error(e)
             raise
 
-    def _handle_job_error(self, error: Exception):
+    def _handle_job_error(self, error: Exception | str):
         """
         Handle job execution error
 
@@ -265,6 +265,7 @@ def _cron_check_running_jobs(self):
             ]
         )
         for job in jobs:
-            job.write({"state": "failed", "error_message": _("Job timed out")})
-            message = _("Job %s timed out") % job.name
-            job._notify_user(message)
+            job._handle_job_error(_("Job timed out"))
+            if job.state == "failed":
+                message = _("Job %s timed out") % job.name
+                job._notify_user(message)

base_bg/tests/test_bg_job.py

@@ -77,11 +77,12 @@ def test_cron_check_running_jobs(self):
         """Test cron method for checking timed out running jobs."""
         # Create a job that appears to be running for too long
         old_time = fields.Datetime.now() - timedelta(hours=6)
-        job = self._create_job(name="Timed Out Job", state="running", start_time=old_time)
+        job = self._create_job(name="Timed Out Job", state="running", start_time=old_time, max_retries=1)
 
         # Run the cron method
         self._set_cron_timeout(300)
-        self.BgJob._cron_check_running_jobs()
+        with patch("odoo.addons.base_bg.models.bg_job._logger.error"):
+            self.BgJob._cron_check_running_jobs()
 
         # Refresh the job from database
         job = self.BgJob.browse(job.id)