diff --git a/discord/gateway.py b/discord/gateway.py index 5611e732b..439cdfa83 100644 --- a/discord/gateway.py +++ b/discord/gateway.py @@ -245,7 +245,7 @@ class DiscordWebSocket(websockets.client.WebSocketClientProtocol): client._connection._update_references(ws) - log.info('Created websocket connected to %s', gateway) + log.debug('Created websocket connected to %s', gateway) # poll event for OP Hello await ws.poll_event() @@ -259,7 +259,7 @@ class DiscordWebSocket(websockets.client.WebSocketClientProtocol): await ws.ensure_open() except websockets.exceptions.ConnectionClosed: # ws got closed so let's just do a regular IDENTIFY connect. - log.info('RESUME failed (the websocket decided to close) for Shard ID %s. Retrying.', shard_id) + log.warning('RESUME failed (the websocket decided to close) for Shard ID %s. Retrying.', shard_id) return await cls.from_client(client, shard_id=shard_id) else: return ws @@ -373,7 +373,7 @@ class DiscordWebSocket(websockets.client.WebSocketClientProtocol): # "reconnect" can only be handled by the Client # so we terminate our connection and raise an # internal exception signalling to reconnect. - log.info('Received RECONNECT opcode.') + log.debug('Received RECONNECT opcode.') await self.close() raise ResumeWebSocket(self.shard_id) diff --git a/discord/state.py b/discord/state.py index fcfed7d94..046b548d7 100644 --- a/discord/state.py +++ b/discord/state.py @@ -314,7 +314,9 @@ class ConnectionState: try: await utils.sane_wait_for(chunks, timeout=len(chunks) * 30.0) except asyncio.TimeoutError: - log.info('Somehow timed out waiting for chunks.') + log.warning('Somehow timed out waiting for chunks.') + else: + log.info('Finished requesting guild member chunks for %d guilds.', len(guilds)) async def query_members(self, guild, query, limit, cache): guild_id = guild.id @@ -339,7 +341,7 @@ class ConnectionState: return members except asyncio.TimeoutError: - log.info('Timed out waiting for chunks with query %r and limit %d for guild_id %d', query, limit, guild_id) + log.warning('Timed out waiting for chunks with query %r and limit %d for guild_id %d', query, limit, guild_id) raise async def _delay_ready(self): @@ -884,7 +886,7 @@ class ConnectionState: guild_id = int(data['guild_id']) guild = self._get_guild(guild_id) members = [Member(guild=guild, data=member, state=self) for member in data.get('members', [])] - log.info('Processed a chunk for %s members in guild ID %s.', len(members), guild_id) + log.debug('Processed a chunk for %s members in guild ID %s.', len(members), guild_id) if self._cache_members: for member in members: existing = guild.get_member(member.id) @@ -1055,6 +1057,8 @@ class AutoShardedConnectionState(ConnectionState): await utils.sane_wait_for(chunks, timeout=len(chunks) * 30.0) except asyncio.TimeoutError: log.info('Somehow timed out waiting for chunks.') + else: + log.info('Finished requesting guild member chunks for %d guilds.', len(guilds)) async def _delay_ready(self): launch = self._ready_state.launch