Skip to content

Preserve subprocess output on timeout with graceful shutdown #123

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

Merged
saintstack merged 1 commit into from
Dec 5, 2025
Merged

Preserve subprocess output on timeout with graceful shutdown #123

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
19 changes: 14 additions & 5 deletions joshua/joshua_agent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,12 +592,21 @@ def _run_ensemble(
break
if timeout_time and time.time() > timeout_time:
log("<timed out>")
process.kill()
# Get any remaining output after kill
remaining_out, remaining_err = process.communicate()
# Combine partial output from timeout exception + remaining after kill
# First try graceful shutdown with SIGTERM - gives Python's finally block time to execute
process.terminate()
try:
# Wait up to 5 seconds for graceful shutdown
remaining_out, remaining_err = process.communicate(timeout=5)
log("Process terminated gracefully after SIGTERM")
except subprocess.TimeoutExpired:
# Still running after SIGTERM - force kill with SIGKILL
log("Process didn't terminate after SIGTERM - sending SIGKILL")
process.kill()
remaining_out, remaining_err = process.communicate()

# Combine partial output from timeout exception + remaining after terminate/kill
output = (timeout_ex.stdout or b"") + (remaining_out or b"")
log(f"Captured {len(output)} bytes on timeout (timeout_partial={len(timeout_ex.stdout or b'')}, post_kill={len(remaining_out or b'')})")
log(f"Captured {len(output)} bytes on timeout (timeout_partial={len(timeout_ex.stdout or b'')}, post_terminate={len(remaining_out or b'')})")

# If we got NO output at all (hung before test started), generate fallback XML
if len(output) == 0 or output.strip() == b"":
Expand Down