[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 11, 2023 · df49224 · df49224
1 parent 46794f4
commit df49224
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/sos/utilities.py b/sos/utilities.py
@@ -233,7 +233,15 @@ def _check_poller(proc):
 
         if poller:
             while reader.running:
-                _check_poller(p)
+                try:
+                    _check_poller(p)
+                except SoSTimeoutError:
+                    p.terminate()
+                    if to_file:
+                        _output.close()
+                    reader.running = False
+                    return {'status': 124, 'output': reader.get_contents(),
+                            'truncated': reader.is_full}
         else:
             try:
                 # override timeout=0 to timeout=None, as Popen will treat the