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

fix(run_command): fix subprocess timeout recovery #179

Merged
merged 2 commits into from
May 15, 2024
Merged

fix(run_command): fix subprocess timeout recovery #179

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b36c01
fix(run_command): fix subprocess timeout recovery
ketiltrout May 15, 2024
1a7d9af
remove the perl that was leaking in
ketiltrout May 15, 2024
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
5 changes: 4 additions & 1 deletion alpenhorn/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ def run_command(
-------
retval : int or None
Return code, or None if the process was killed after timing out.
Integer zero indicates success.
stdout : string
Value of stdout.
stderr : string
Expand All @@ -48,8 +49,10 @@ def run_command(
stdout_val, stderr_val = proc.communicate(timeout=timeout)
retval = proc.returncode
except subprocess.TimeoutExpired:
log.warning(f"Process overrun [timeout={timeout}]: " + " ".join(cmd))
proc.kill()
stdout_val, stderr_val = proc.communicate()
stdout_val = "";
stderr_val = "";
retval = None

return (
Expand Down
Loading