Skip to content

Use atexit to always kill worker #2822

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
joeyballentine merged 1 commit into from
Apr 27, 2024
Merged

Use atexit to always kill worker #2822

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
18 changes: 14 additions & 4 deletions backend/src/server_process_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from __future__ import annotations

import asyncio
import atexit
import os
import re
import socket
Expand Down Expand Up @@ -63,16 +64,25 @@ def __init__(self, flags: list[str]):
)
self._stderr_thread.start()

atexit.register(self.close)

def close(self):
if self._process is None:
# already closed
return

logger.info("Closing worker process...")
self._stop_event.set()
if self._process is not None:
try:
self._process.terminate()
self._process.kill()
self._process = None
except Exception:
logger.error("Failed to terminate worker process", exc_info=True)
self._process = None
atexit.unregister(self.close)

self._stdout_thread = None
self._stderr_thread = None
self._stdout_thread = None
self._stderr_thread = None

def _read_stdout(self):
p = self._process
Expand Down