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
13 changes: 13 additions & 0 deletions taskiq/brokers/inmemory_broker.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from typing import Any, TypeVar

from taskiq.abc.broker import AsyncBroker
from taskiq.abc.middleware import TaskiqMiddleware
from taskiq.abc.result_backend import AsyncResultBackend, TaskiqResult
from taskiq.depends.progress_tracker import TaskProgress
from taskiq.events import TaskiqEvents
Expand Down Expand Up @@ -198,9 +199,21 @@ async def startup(self) -> None:
for handler in self.event_handlers.get(event, []):
await maybe_awaitable(handler(self.state))

for middleware in self.middlewares:
if middleware.__class__.startup != TaskiqMiddleware.startup:
await maybe_awaitable(middleware.startup())

await self.result_backend.startup()

async def shutdown(self) -> None:
"""Runs shutdown events for client and worker side."""
for event in (TaskiqEvents.CLIENT_SHUTDOWN, TaskiqEvents.WORKER_SHUTDOWN):
for handler in self.event_handlers.get(event, []):
await maybe_awaitable(handler(self.state))

for middleware in self.middlewares:
if middleware.__class__.shutdown != TaskiqMiddleware.shutdown:
await maybe_awaitable(middleware.shutdown())

await self.result_backend.shutdown()
self.executor.shutdown()
19 changes: 19 additions & 0 deletions tests/brokers/test_inmemory.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import pytest

from taskiq import InMemoryBroker
from taskiq.abc.middleware import TaskiqMiddleware
from taskiq.events import TaskiqEvents
from taskiq.state import TaskiqState

Expand Down Expand Up @@ -66,6 +67,24 @@ async def _c_startup(state: TaskiqState) -> None:
assert broker.state.from_client == test_value


async def test_middleware_startup_and_shutdown_fire() -> None:
calls = []

class RecordingMiddleware(TaskiqMiddleware):
async def startup(self) -> None:
calls.append("startup")

async def shutdown(self) -> None:
calls.append("shutdown")

broker = InMemoryBroker().with_middlewares(RecordingMiddleware())

await broker.startup()
await broker.shutdown()

assert calls == ["startup", "shutdown"]


async def test_execution() -> None:
broker = InMemoryBroker()
test_value = uuid.uuid4().hex
Expand Down
Loading