mirrors/discord.py
1
0
Fork 0
mirror of https://github.com/Rapptz/discord.py.git synced 2025-04-18 23:15:48 +00:00
Code Issues Projects Releases Wiki Activity

Give large guilds more time to chunk before timing out

Browse Source
This commit is contained in:
Lilly Rose Berner 2022-04-25 19:00:14 +02:00 committed by GitHub
parent 6d95ed19b0
commit 5a06fa5f3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
discord/state.py
View File

@ -528,8 +528,10 @@ class ConnectionState:
self.dispatch('guild_join', guild)
for guild, future in states:
timeout = self._chunk_timeout(guild)
try:
await asyncio.wait_for(future, timeout=5.0)
await asyncio.wait_for(future, timeout=timeout)
except asyncio.TimeoutError:
_log.warning('Shard ID %s timed out waiting for chunks for guild_id %s.', guild.shard_id, guild.id)
@ -1096,9 +1098,14 @@ class ConnectionState:
return await request.wait()
return request.get_future()
def _chunk_timeout(self, guild: Guild) -> float:
return max(5.0, (guild.member_count or 0) / 10000)
async def _chunk_and_dispatch(self, guild, unavailable):
timeout = self._chunk_timeout(guild)
try:
await asyncio.wait_for(self.chunk_guild(guild), timeout=60.0)
await asyncio.wait_for(self.chunk_guild(guild), timeout=timeout)
except asyncio.TimeoutError:
_log.info('Somehow timed out waiting for chunks.')
@ -1582,8 +1589,10 @@ class AutoShardedConnectionState(ConnectionState):
self.dispatch('guild_join', guild)
for guild, future in states:
timeout = self._chunk_timeout(guild)
try:
await asyncio.wait_for(future, timeout=5.0)
await asyncio.wait_for(future, timeout=timeout)
except asyncio.TimeoutError:
_log.warning('Shard ID %s timed out waiting for chunks for guild_id %s.', guild.shard_id, guild.id)