Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion taskiq/cli/worker/process_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,8 @@ def _shutdown_workers(self) -> None:
worker.name,
worker.pid,
)
except ProcessLookupError:
# On Windows os.kill raises PermissionError for an exited process.
except (ProcessLookupError, PermissionError):
logger.info(
"Process %s (pid %s) already terminated",
worker.name,
Expand Down
35 changes: 35 additions & 0 deletions tests/cli/worker/test_process_manager.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import logging
import signal

import pytest

from taskiq.cli.worker.args import WorkerArgs
from taskiq.cli.worker.process_manager import ProcessManager


def exit_immediately(args: WorkerArgs) -> None:
pass


def test_shutdown_workers_skips_exited_worker(
monkeypatch: pytest.MonkeyPatch,
caplog: pytest.LogCaptureFixture,
) -> None:
"""
A worker that has already exited doesn't break the shutdown.

On Windows `os.kill` raises `PermissionError` for such a process.
"""
# ProcessManager must not replace signal handlers of the pytest process.
monkeypatch.setattr(signal, "signal", lambda *_: None)
manager = ProcessManager(
args=WorkerArgs(broker="", modules=[], workers=1),
worker_function=exit_immediately,
)
manager.prepare_workers()
manager.workers[0].join()

with caplog.at_level(logging.INFO, logger="taskiq.process-manager"):
manager._shutdown_workers()

assert "already terminated" in caplog.text
Loading