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

Change dispatcher logging.

Browse source
This commit is contained in:
Alex Root Junior 2017-11-27 17:29:04 +02:00
parent 2fac330c81
commit 68e016ecab
1 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
aiogram/dispatcher/__init__.py
View file

@ -3,6 +3,8 @@ import functools
import logging import logging
import typing import typing
import time
from .filters import CommandsFilter, ContentTypeFilter, ExceptionsFilter, RegexpFilter, USER_STATE, \ from .filters import CommandsFilter, ContentTypeFilter, ExceptionsFilter, RegexpFilter, USER_STATE, \
generate_default_filters generate_default_filters
from .handler import Handler from .handler import Handler
@ -113,6 +115,9 @@ class Dispatcher:
:param update: :param update:
:return: :return:
""" """
start = time.time()
success = True
try: try:
self.last_update_id = update.update_id self.last_update_id = update.update_id
has_context = context.check_configured() has_context = context.check_configured()
@ -178,10 +183,15 @@ class Dispatcher:
state=state) state=state)
return await self.pre_checkout_query_handlers.notify(update.pre_checkout_query) return await self.pre_checkout_query_handlers.notify(update.pre_checkout_query)
except Exception as e: except Exception as e:
success = False
err = await self.errors_handlers.notify(self, update, e) err = await self.errors_handlers.notify(self, update, e)
if err: if err:
return err return err
raise raise
finally:
log.info(f"Process update [ID:{update.update_id}]: "
f"{['failed', 'success'][success]} "
f"(in {round((time.time() - start) * 1000)} ms)")
async def reset_webhook(self, check=True) -> bool: async def reset_webhook(self, check=True) -> bool:
""" """
@ -208,7 +218,7 @@ class Dispatcher:
""" """
return await self.start_polling(*args, **kwargs) return await self.start_polling(*args, **kwargs)
async def start_polling(self, timeout=20, relax=0.1, limit=None, reset_webhook=True): async def start_polling(self, timeout=20, relax=0.1, limit=None, reset_webhook=None):
""" """
Start long-polling Start long-polling
@ -227,6 +237,8 @@ class Dispatcher:
context.set_value('dispatcher', self) context.set_value('dispatcher', self)
context.set_value('bot', self.bot) context.set_value('bot', self.bot)
if reset_webhook is None:
await self.reset_webhook(check=False)
if reset_webhook: if reset_webhook:
await self.reset_webhook(check=True) await self.reset_webhook(check=True)
@ -241,7 +253,7 @@ class Dispatcher:
continue continue
if updates: if updates:
log.info("Received {0} updates.".format(len(updates))) log.debug(f"Received {len(updates)} updates.")
offset = updates[-1].update_id + 1 offset = updates[-1].update_id + 1
self.loop.create_task(self._process_polling_updates(updates)) self.loop.create_task(self._process_polling_updates(updates))