python/aiogram
1
0
Fork 0
mirror of https://github.com/aiogram/aiogram.git synced 2025-12-12 10:11:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix webhook executor. I think.

Browse source
This commit is contained in:
Alex Root Junior 2018-05-18 22:13:12 +03:00
parent 5ed2b35eed
commit b767c3e8f6
1 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

20
aiogram/utils/executor.py
View file

@ -185,7 +185,7 @@ class Executor:
if app is None: if app is None:
self._web_app = app = web.Application() self._web_app = app = web.Application()
if self._identity in self._identity: if self._identity == app.get(self._identity):
# App is already configured # App is already configured
return return
@ -197,9 +197,13 @@ class Executor:
for callback in self._on_startup_webhook: for callback in self._on_startup_webhook:
app.on_startup.append(functools.partial(_wrap_callback, callback)) app.on_startup.append(functools.partial(_wrap_callback, callback))
for callback in self._on_shutdown_webhook: # for callback in self._on_shutdown_webhook:
app.on_shutdown.append(functools.partial(_wrap_callback, callback)) # app.on_shutdown.append(functools.partial(_wrap_callback, callback))
async def _on_shutdown(_):
await self._shutdown_webhook()
app.on_shutdown.append(_on_shutdown)
app[APP_EXECUTOR_KEY] = self app[APP_EXECUTOR_KEY] = self
app[BOT_DISPATCHER_KEY] = self.dispatcher app[BOT_DISPATCHER_KEY] = self.dispatcher
app[self._identity] = datetime.datetime.now() app[self._identity] = datetime.datetime.now()
@ -216,6 +220,7 @@ class Executor:
""" """
self._prepare_webhook(webhook_path, request_handler) self._prepare_webhook(webhook_path, request_handler)
self.loop.run_until_complete(self._startup_webhook()) self.loop.run_until_complete(self._startup_webhook())
web.run_app(self._web_app, **kwargs) web.run_app(self._web_app, **kwargs)
def start_polling(self, reset_webhook=None): def start_polling(self, reset_webhook=None):
@ -296,6 +301,15 @@ class Executor:
if wait_closed: if wait_closed:
await self.dispatcher.wait_closed() await self.dispatcher.wait_closed()
async def _shutdown_webhook(self, wait_closed=False):
for callback in self._on_shutdown_webhook:
await callback(self.dispatcher)
await self._shutdown()
if wait_closed:
await self.dispatcher.wait_closed()
async def _startup_webhook(self): async def _startup_webhook(self):
await self._welcome() await self._welcome()
if self.skip_updates: if self.skip_updates: