Audit: Better error message on subprocess error

github_app_geo_project/module/audit/__init__.py

@@ -251,7 +251,10 @@ async def _process_snyk_dpkg(
                     else:
                         if pull_request is not None:
                             issue_check.set_title(key, f"{key} ([Pull request]({pull_request.html_url}))")
-
+    except (subprocess.CalledProcessError, subprocess.TimeoutExpired) as proc_error:
+        message = module_utils.ansi_proc_message(proc_error)
+        _LOGGER.exception("Audit %s process error", key)
+        return [f"Error while processing the audit {key}: {proc_error}"], False
     except Exception as exception:  # pylint: disable=broad-except
         _LOGGER.exception("Audit %s error", key)
         return [f"Error while processing the audit {key}: {exception}"], False

github_app_geo_project/module/utils.py

@@ -433,13 +433,17 @@ def to_markdown(self, summary: bool = False) -> str:
 
     @staticmethod
     def from_process(
-        proc: subprocess.CompletedProcess[str] | subprocess.CalledProcessError,
+        proc: subprocess.CompletedProcess[str] | subprocess.CalledProcessError | subprocess.TimeoutExpired,
     ) -> "AnsiProcessMessage":
         """Create a process message from a subprocess."""
+        if isinstance(proc, subprocess.TimeoutExpired):
+            return AnsiProcessMessage(cast(list[str], proc.args), None, proc.output, cast(str, proc.stderr))
         return AnsiProcessMessage(cast(list[str], proc.args), proc.returncode, proc.stdout, proc.stderr)
 
 
-def ansi_proc_message(proc: subprocess.CompletedProcess[str] | subprocess.CalledProcessError) -> Message:
+def ansi_proc_message(
+    proc: subprocess.CompletedProcess[str] | subprocess.CalledProcessError | subprocess.TimeoutExpired,
+) -> Message:
     """
     Process the output of a subprocess for the dashboard (markdown)/HTML.
 

github_app_geo_project/scripts/process_queue.py

@@ -347,7 +347,7 @@ async def _process_job(
                 finally:
                     root_logger.removeHandler(handler)
             raise
-        except subprocess.CalledProcessError as proc_error:
+        except (subprocess.CalledProcessError, subprocess.TimeoutExpired) as proc_error:
             job.status = models.JobStatus.ERROR
             job.finished_at = datetime.datetime.now(tz=datetime.timezone.utc)
             message = module_utils.ansi_proc_message(proc_error)