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

Implements opportunity to change request timeouts

Browse source
This commit is contained in:
Alex RootJunior 2019-04-17 23:24:23 +03:00
parent 71c49fd08b
commit beca19b5e2
3 changed files with 71 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

24
aiogram/dispatcher/dispatcher.py
View file

@ -5,6 +5,9 @@ import logging
import time
import typing
import aiohttp
from aiohttp.helpers import sentinel
from .filters import Command, ContentTypeFilter, ExceptionsFilter, FiltersFactory, FuncFilter, HashTag, Regexp, \
RegexpCommandsFilter, StateFilter, Text
from .handler import Handler
@ -209,8 +212,13 @@ class Dispatcher(DataMixin, ContextInstanceMixin):
return await self.bot.delete_webhook()
async def start_polling(self, timeout=20, relax=0.1, limit=None, reset_webhook=None,
fast: typing.Optional[bool] = True):
async def start_polling(self,
timeout=20,
relax=0.1,
limit=None,
reset_webhook=None,
fast: typing.Optional[bool] = True,
error_sleep: int = 5):
"""
Start long-polling
@ -238,12 +246,19 @@ class Dispatcher(DataMixin, ContextInstanceMixin):
self._polling = True
offset = None
try:
current_request_timeout = self.bot.timeout
if current_request_timeout is not sentinel and timeout is not None:
request_timeout = aiohttp.ClientTimeout(total=current_request_timeout.total + timeout or 1)
else:
request_timeout = None
while self._polling:
try:
updates = await self.bot.get_updates(limit=limit, offset=offset, timeout=timeout)
with self.bot.request_timeout(request_timeout):
updates = await self.bot.get_updates(limit=limit, offset=offset, timeout=timeout)
except:
log.exception('Cause exception while getting updates.')
await asyncio.sleep(15)
await asyncio.sleep(error_sleep)
continue
if updates:
@ -254,6 +269,7 @@ class Dispatcher(DataMixin, ContextInstanceMixin):
if relax:
await asyncio.sleep(relax)
finally:
self._close_waiter._set_result(None)
log.warning('Polling is stopped.')