Skip to content

Commit d708468

Browse files
authored
Removed startup event. (#266)
1 parent 4fe5f06 commit d708468

File tree

2 files changed

+6
-11
lines changed

2 files changed

+6
-11
lines changed

taskiq/cli/worker/process_manager.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def handle(
5757
self,
5858
workers: List[Process],
5959
args: WorkerArgs,
60-
worker_func: Callable[[WorkerArgs, EventType], None],
60+
worker_func: Callable[[WorkerArgs], None],
6161
) -> None:
6262
"""
6363
This action reloads a single process.
@@ -79,7 +79,7 @@ def handle(
7979
event: EventType = Event()
8080
new_process = Process(
8181
target=worker_func,
82-
kwargs={"args": args, "event": event},
82+
kwargs={"args": args},
8383
name=f"worker-{self.worker_num}",
8484
daemon=True,
8585
)
@@ -152,9 +152,8 @@ class ProcessManager:
152152
def __init__(
153153
self,
154154
args: WorkerArgs,
155-
worker_function: Callable[[WorkerArgs, EventType], None],
155+
worker_function: Callable[[WorkerArgs], None],
156156
observer: Optional[Observer] = None, # type: ignore[valid-type]
157-
max_restarts: Optional[int] = None,
158157
) -> None:
159158
self.worker_function = worker_function
160159
self.action_queue: "Queue[ProcessActionBase]" = Queue(-1)
@@ -183,7 +182,7 @@ def prepare_workers(self) -> None:
183182
event = Event()
184183
work_proc = Process(
185184
target=self.worker_function,
186-
kwargs={"args": self.args, "event": event},
185+
kwargs={"args": self.args},
187186
name=f"worker-{process}",
188187
daemon=True,
189188
)

taskiq/cli/worker/run.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import signal
44
from concurrent.futures import ThreadPoolExecutor
55
from multiprocessing import set_start_method
6-
from multiprocessing.synchronize import Event
76
from sys import platform
87
from typing import Any, Optional, Type
98

@@ -68,7 +67,7 @@ def get_receiver_type(args: WorkerArgs) -> Type[Receiver]:
6867
return receiver_type
6968

7069

71-
def start_listen(args: WorkerArgs, event: Event) -> None:
70+
def start_listen(args: WorkerArgs) -> None:
7271
"""
7372
This function starts actual listening process.
7473
@@ -109,9 +108,6 @@ def interrupt_handler(signum: int, _frame: Any) -> None:
109108
signal.signal(signal.SIGINT, interrupt_handler)
110109
signal.signal(signal.SIGTERM, interrupt_handler)
111110

112-
# Notify parent process, worker is ready
113-
event.set()
114-
115111
if uvloop is not None:
116112
logger.debug("UVLOOP found. Using it as async runner")
117113
loop = uvloop.new_event_loop() # type: ignore
@@ -165,7 +161,7 @@ def run_worker(args: WorkerArgs) -> Optional[int]:
165161
:returns: Optional status code.
166162
"""
167163
if platform == "darwin":
168-
set_start_method("fork")
164+
set_start_method("spawn")
169165
if args.configure_logging:
170166
logging.basicConfig(
171167
level=logging.getLevelName(args.log_level),

0 commit comments

Comments
 (0)