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

[tasks] Don't update _next_iteration on retry

Browse Source
This commit is contained in:
Josh 2020-08-29 13:12:07 +10:00 committed by GitHub
parent 4203e7a5a8
commit 6baacb2c23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,6 +68,7 @@ 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_failed = False
self._last_iteration = None self._last_iteration = None
self._next_iteration = None self._next_iteration = None
@ -88,18 +89,22 @@ class Loop:
backoff = ExponentialBackoff() backoff = ExponentialBackoff()
await self._call_loop_function('before_loop') await self._call_loop_function('before_loop')
sleep_until = discord.utils.sleep_until sleep_until = discord.utils.sleep_until
self._last_iteration_failed = False
self._next_iteration = datetime.datetime.now(datetime.timezone.utc) self._next_iteration = datetime.datetime.now(datetime.timezone.utc)
try: try:
await asyncio.sleep(0) # allows canceling in before_loop await asyncio.sleep(0) # allows canceling in before_loop
while True: while True:
self._last_iteration = self._next_iteration if not self._last_iteration_failed:
self._next_iteration = self._get_next_sleep_time() self._last_iteration = self._next_iteration
self._next_iteration = self._get_next_sleep_time()
try: try:
await self.coro(*args, **kwargs) await self.coro(*args, **kwargs)
self._last_iteration_failed = False
now = datetime.datetime.now(datetime.timezone.utc) now = datetime.datetime.now(datetime.timezone.utc)
if now > self._next_iteration: if now > self._next_iteration:
self._next_iteration = now self._next_iteration = now
except self._valid_exception as exc: except self._valid_exception as exc:
self._last_iteration_failed = True
if not self.reconnect: if not self.reconnect:
raise raise
await asyncio.sleep(backoff.delay()) await asyncio.sleep(backoff.delay())