[utilities] catch SoSTimeoutError in sos_get_command_output

When calling collect_cmd_output and timeout is hit, SoSTimeoutError is raised and never caught (until in plugin wrapper). Resolves: #3331 Signed-off-by: Pavel Moravec <[email protected]>
sosreport · Aug 9, 2023 · c194ab4 · c194ab4
1 parent 46794f4
commit c194ab4
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/sos/utilities.py b/sos/utilities.py
@@ -263,6 +263,9 @@ def _check_poller(proc):
             _output.close()
         if e.errno == errno.ENOENT:
             return {'status': 127, 'output': "", 'truncated': ''}
+        elif isinstance(e, SoSTimeoutError):
+            return {'status': 124, 'output': reader.get_contents(),
+                    'truncated': reader.is_full}
         else:
             raise e