From 655f06100779e647bb8cca0084b1c217e4598dfa Mon Sep 17 00:00:00 2001 From: sheldy Date: Fri, 8 Sep 2023 23:12:51 +0300 Subject: [PATCH 1/2] update workflow data --- aiogram/dispatcher/dispatcher.py | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/aiogram/dispatcher/dispatcher.py b/aiogram/dispatcher/dispatcher.py index 827b300a..84c241a1 100644 --- a/aiogram/dispatcher/dispatcher.py +++ b/aiogram/dispatcher/dispatcher.py @@ -511,16 +511,11 @@ class Dispatcher(Router): signal.SIGINT, self._signal_stop_polling, signal.SIGINT ) - workflow_data = { - "dispatcher": self, - "bots": bots, - **self.workflow_data, - **kwargs, - } - if "bot" in workflow_data: - workflow_data.pop("bot") + self.workflow_data.update({"dispatcher": self, "bots": bots, **kwargs}) + if "bot" in self.workflow_data: + self.workflow_data.pop("bot") - await self.emit_startup(bot=bots[-1], **workflow_data) + await self.emit_startup(bot=bots[-1], **self.workflow_data) loggers.dispatcher.info("Start polling") try: tasks: List[asyncio.Task[Any]] = [ @@ -531,7 +526,7 @@ class Dispatcher(Router): polling_timeout=polling_timeout, backoff_config=backoff_config, allowed_updates=allowed_updates, - **workflow_data, + **self.workflow_data, ) ) for bot in bots @@ -550,7 +545,7 @@ class Dispatcher(Router): finally: loggers.dispatcher.info("Polling stopped") try: - await self.emit_shutdown(bot=bots[-1], **workflow_data) + await self.emit_shutdown(bot=bots[-1], **self.workflow_data) finally: if close_bot_session: await asyncio.gather(*(bot.session.close() for bot in bots)) From 1961ce5b46ff0413bb656b967d39f71b1e8392b8 Mon Sep 17 00:00:00 2001 From: sheldy Date: Fri, 8 Sep 2023 23:17:26 +0300 Subject: [PATCH 2/2] changelog --- CHANGES/1298.bugfix | 1 + 1 file changed, 1 insertion(+) create mode 100644 CHANGES/1298.bugfix diff --git a/CHANGES/1298.bugfix b/CHANGES/1298.bugfix new file mode 100644 index 00000000..c6e79c15 --- /dev/null +++ b/CHANGES/1298.bugfix @@ -0,0 +1 @@ +Update workflow data on start