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

fix: correct typing on signal handler #664

Merged
merged 2 commits into from
Nov 13, 2024
Merged

fix: correct typing on signal handler #664

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6efa54
fix: correct typing on signal handler
igor47 Nov 12, 2024
ecc2727
cli: fix sort order
Bogdanp Nov 13, 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
12 changes: 8 additions & 4 deletions dramatiq/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,10 @@
import signal
import sys
import time
import types
from itertools import chain
from threading import Event, Thread
from typing import Optional

from dramatiq import Broker, ConnectionError, Worker, __version__, get_broker, get_logger
from dramatiq.canteen import Canteen, canteen_add, canteen_get, canteen_try_init
Expand Down Expand Up @@ -559,24 +561,26 @@ def main(args=None): # noqa
)
log_watcher.start()

def stop_subprocesses(signum):
def stop_subprocesses(signum: signal.Signals):
nonlocal running
running = False

for proc in chain(worker_processes, fork_processes):
try:
os.kill(proc.pid, signum)
os.kill(proc.pid, signum.value)
except OSError: # pragma: no cover
if proc.exitcode is None:
logger.warning("Failed to send %r to PID %d.", signum.name, proc.pid)

def sighandler(signum, frame):
def sighandler(signum: int, frame: Optional[types.FrameType]):
nonlocal reload_process
signum = signal.Signals(signum)

reload_process = signum == getattr(signal, "SIGHUP", None)
if signum == signal.SIGINT:
signum = signal.SIGTERM

logger.info("Sending signal %r to subprocesses...", getattr(signum, "name", signum))
logger.info("Sending signal %r to subprocesses...", signum.name)
stop_subprocesses(signum)

retcode = RET_OK
Expand Down
Loading