matthew/enhanced-discord.py
1
0
Fork 0
Code Issues 4 Pull Requests 21 Projects Releases Wiki Activity

[tasks] Fix issue with next_iteration when task overruns time allotted

Browse Source
This commit is contained in:
Josh B 2020-01-21 15:07:50 +10:00 committed by Rapptz
parent a0b3e61b51
commit d7e925eb89
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
discord/ext/tasks/__init__.py
View File

@ -46,8 +46,8 @@ class Loop:
raise ValueError('count must be greater than 0 or None.') raise ValueError('count must be greater than 0 or None.')
self.change_interval(seconds=seconds, minutes=minutes, hours=hours) self.change_interval(seconds=seconds, minutes=minutes, hours=hours)
self._last_iteration = datetime.datetime.now(datetime.timezone.utc) self._last_iteration = None
self._next_iteration = self._get_next_sleep_time() self._next_iteration = None
if not inspect.iscoroutinefunction(self.coro): if not inspect.iscoroutinefunction(self.coro):
raise TypeError('Expected coroutine function, not {0.__name__!r}.'.format(type(self.coro))) raise TypeError('Expected coroutine function, not {0.__name__!r}.'.format(type(self.coro)))
@ -65,12 +65,16 @@ class Loop:
async def _loop(self, *args, **kwargs): async def _loop(self, *args, **kwargs):
backoff = ExponentialBackoff() backoff = ExponentialBackoff()
await self._call_loop_function('before_loop') await self._call_loop_function('before_loop')
self._next_iteration = datetime.datetime.now(datetime.timezone.utc)
try: try:
while True: while True:
self._last_iteration = self._next_iteration self._last_iteration = self._next_iteration
self._next_iteration = self._get_next_sleep_time() self._next_iteration = self._get_next_sleep_time()
try: try:
await self.coro(*args, **kwargs) await self.coro(*args, **kwargs)
now = datetime.datetime.now(datetime.timezone.utc)
if now > self._next_iteration:
self._next_iteration = now
except self._valid_exception as exc: except self._valid_exception as exc:
if not self.reconnect: if not self.reconnect:
raise raise
@ -329,7 +333,7 @@ class Loop:
async def _sleep_until(self, dt): async def _sleep_until(self, dt):
now = datetime.datetime.now(datetime.timezone.utc) now = datetime.datetime.now(datetime.timezone.utc)
delta = (dt - now).total_seconds() delta = (dt - now).total_seconds()
await asyncio.sleep(delta) await asyncio.sleep(max(delta, 0))
def _get_next_sleep_time(self): def _get_next_sleep_time(self):
return self._last_iteration + datetime.timedelta(seconds=self._sleep) return self._last_iteration + datetime.timedelta(seconds=self._sleep)