Mirror/intercept
1
0
Fork 0
mirror of https://github.com/smittix/intercept.git synced 2026-04-24 06:40:00 -07:00
Code Issues Packages Projects Releases Wiki Activity

Speed up Morse startup failure cleanup to avoid request timeouts

Browse Source
This commit is contained in:
Smittix
2026-02-26 13:30:09 +00:00
parent e3cf9daaed
commit 146bca4b37
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
routes/morse.py
View File

@@ -432,10 +432,21 @@ def start_morse() -> Response:
if proc is not None:
_close_pipe(getattr(proc, 'stdout', None))
_close_pipe(getattr(proc, 'stderr', None))
safe_terminate(proc, timeout=0.5)
# Keep startup retries responsive; avoid long waits inside
# generic safe_terminate() during a failed attempt.
if proc.poll() is None:
with contextlib.suppress(Exception):
proc.terminate()
with contextlib.suppress(subprocess.TimeoutExpired, Exception):
proc.wait(timeout=0.15)
if proc.poll() is None:
with contextlib.suppress(Exception):
proc.kill()
with contextlib.suppress(subprocess.TimeoutExpired, Exception):
proc.wait(timeout=0.25)
unregister_process(proc)
_join_thread(attempt_decoder_thread, timeout_s=0.35)
_join_thread(attempt_stderr_thread, timeout_s=0.35)
_join_thread(attempt_decoder_thread, timeout_s=0.20)
_join_thread(attempt_stderr_thread, timeout_s=0.20)
attempt_errors: list[str] = []
full_cmd = ''
@@ -560,7 +571,7 @@ def start_morse() -> Response:
)
decoder_thread.start()
startup_deadline = time.monotonic() + 2.0
startup_deadline = time.monotonic() + 1.2
startup_ok = False
startup_error = ''