|
23 | 23 | from taskiq.acks import AckableMessage |
24 | 24 | from taskiq.decor import AsyncTaskiqDecoratedTask |
25 | 25 | from taskiq.events import TaskiqEvents |
26 | | -from taskiq.exceptions import TaskBrokerMismatchError |
| 26 | +from taskiq.exceptions import SendTaskError, TaskBrokerMismatchError |
27 | 27 | from taskiq.formatters.proxy_formatter import ProxyFormatter |
28 | 28 | from taskiq.message import BrokerMessage |
29 | 29 | from taskiq.result_backends.dummy import DummyResultBackend |
@@ -186,39 +186,90 @@ def add_middlewares(self, *middlewares: "TaskiqMiddleware") -> None: |
186 | 186 |
|
187 | 187 | async def startup(self) -> None: |
188 | 188 | """Do something when starting broker.""" |
189 | | - event = TaskiqEvents.CLIENT_STARTUP |
190 | | - if self.is_worker_process: |
191 | | - event = TaskiqEvents.WORKER_STARTUP |
192 | | - |
193 | | - for handler in self.event_handlers[event]: |
194 | | - await maybe_awaitable(handler(self.state)) |
| 189 | + for event in self._get_startup_events(): |
| 190 | + for handler in self.event_handlers[event]: |
| 191 | + await maybe_awaitable(handler(self.state)) |
195 | 192 |
|
196 | 193 | for middleware in self.middlewares: |
197 | 194 | if middleware.__class__.startup != TaskiqMiddleware.startup: |
198 | 195 | await maybe_awaitable(middleware.startup()) |
199 | 196 |
|
200 | 197 | await self.result_backend.startup() |
201 | 198 |
|
| 199 | + def _get_startup_events(self) -> tuple[TaskiqEvents, ...]: |
| 200 | + """Return event phases owned by this broker startup.""" |
| 201 | + if self.is_worker_process: |
| 202 | + return (TaskiqEvents.WORKER_STARTUP,) |
| 203 | + return (TaskiqEvents.CLIENT_STARTUP,) |
| 204 | + |
202 | 205 | async def shutdown(self) -> None: |
203 | 206 | """ |
204 | 207 | Close the broker. |
205 | 208 |
|
206 | 209 | This method is called, |
207 | 210 | when broker is closing. |
208 | 211 | """ |
209 | | - event = TaskiqEvents.CLIENT_SHUTDOWN |
210 | | - if self.is_worker_process: |
211 | | - event = TaskiqEvents.WORKER_SHUTDOWN |
| 212 | + shutdown_error: BaseException | None = None |
212 | 213 |
|
213 | | - # Call all shutdown events. |
214 | | - for handler in self.event_handlers[event]: |
215 | | - await maybe_awaitable(handler(self.state)) |
| 214 | + for event in self._get_shutdown_events(): |
| 215 | + for handler in self.event_handlers[event]: |
| 216 | + try: |
| 217 | + await maybe_awaitable(handler(self.state)) |
| 218 | + except BaseException as exc: |
| 219 | + shutdown_error = self._remember_shutdown_error( |
| 220 | + shutdown_error, |
| 221 | + exc, |
| 222 | + ) |
216 | 223 |
|
217 | 224 | for middleware in self.middlewares: |
218 | 225 | if middleware.__class__.shutdown != TaskiqMiddleware.shutdown: |
219 | | - await maybe_awaitable(middleware.shutdown()) |
| 226 | + try: |
| 227 | + await maybe_awaitable(middleware.shutdown()) |
| 228 | + except BaseException as exc: |
| 229 | + shutdown_error = self._remember_shutdown_error( |
| 230 | + shutdown_error, |
| 231 | + exc, |
| 232 | + ) |
| 233 | + |
| 234 | + try: |
| 235 | + await self.result_backend.shutdown() |
| 236 | + except BaseException as exc: |
| 237 | + shutdown_error = self._remember_shutdown_error(shutdown_error, exc) |
| 238 | + |
| 239 | + if shutdown_error is not None: |
| 240 | + raise shutdown_error |
| 241 | + |
| 242 | + def _get_shutdown_events(self) -> tuple[TaskiqEvents, ...]: |
| 243 | + """Return event phases owned by this broker shutdown.""" |
| 244 | + if self.is_worker_process: |
| 245 | + return (TaskiqEvents.WORKER_SHUTDOWN,) |
| 246 | + return (TaskiqEvents.CLIENT_SHUTDOWN,) |
| 247 | + |
| 248 | + @staticmethod |
| 249 | + def _remember_shutdown_error( |
| 250 | + first_error: BaseException | None, |
| 251 | + current_error: BaseException, |
| 252 | + ) -> BaseException: |
| 253 | + """Keep the first shutdown failure while cleanup continues.""" |
| 254 | + if first_error is None: |
| 255 | + return current_error |
| 256 | + logger.error( |
| 257 | + "Additional error while shutting down broker resources.", |
| 258 | + exc_info=current_error, |
| 259 | + ) |
| 260 | + return first_error |
220 | 261 |
|
221 | | - await self.result_backend.shutdown() |
| 262 | + async def _kick_with_post_send( |
| 263 | + self, |
| 264 | + message: BrokerMessage, |
| 265 | + post_send: Callable[[], Awaitable[None]], |
| 266 | + ) -> None: |
| 267 | + """Run the package-internal send boundary used by AsyncKicker.""" |
| 268 | + try: |
| 269 | + await self.kick(message) |
| 270 | + except Exception as exc: |
| 271 | + raise SendTaskError from exc |
| 272 | + await post_send() |
222 | 273 |
|
223 | 274 | @abstractmethod |
224 | 275 | async def kick( |
|
0 commit comments