Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[utilities] catch SoSTimeoutError in sos_get_command_output #3331

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[utilities] catch SoSTimeoutError in sos_get_command_output #3331

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion sos/utilities.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down