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

Add shard ID to keep alive logger messages

Browse Source
This commit is contained in:
Rapptz 2020-04-06 21:39:05 -04:00
parent 09ecb16680
commit ba35c2b9bf
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
discord/gateway.py
View File

@ -73,9 +73,9 @@ class KeepAliveHandler(threading.Thread):
self.interval = interval self.interval = interval
self.daemon = True self.daemon = True
self.shard_id = shard_id self.shard_id = shard_id
self.msg = 'Keeping websocket alive with sequence %s.' self.msg = 'Keeping shard ID %d websocket alive with sequence %s.'
self.block_msg = 'Heartbeat blocked for more than %s seconds.' self.block_msg = 'Shard ID %d heartbeat blocked for more than %s seconds.'
self.behind_msg = 'Can\'t keep up, websocket is %.1fs behind.' self.behind_msg = 'Can\'t keep up, shard ID %d websocket is %.1fs behind.'
self._stop_ev = threading.Event() self._stop_ev = threading.Event()
self._last_ack = time.perf_counter() self._last_ack = time.perf_counter()
self._last_send = time.perf_counter() self._last_send = time.perf_counter()
@ -98,7 +98,7 @@ class KeepAliveHandler(threading.Thread):
return return
data = self.get_payload() data = self.get_payload()
log.debug(self.msg, data['d']) log.debug(self.msg, self.shard_id, data['d'])
coro = self.ws.send_as_json(data) coro = self.ws.send_as_json(data)
f = asyncio.run_coroutine_threadsafe(coro, loop=self.ws.loop) f = asyncio.run_coroutine_threadsafe(coro, loop=self.ws.loop)
try: try:
@ -117,7 +117,7 @@ class KeepAliveHandler(threading.Thread):
else: else:
stack = traceback.format_stack(frame) stack = traceback.format_stack(frame)
msg = '%s\nLoop thread traceback (most recent call last):\n%s' % (self.block_msg, ''.join(stack)) msg = '%s\nLoop thread traceback (most recent call last):\n%s' % (self.block_msg, ''.join(stack))
log.warning(msg, total) log.warning(msg, self.shard_id, total)
except Exception: except Exception:
self.stop() self.stop()
@ -138,15 +138,15 @@ class KeepAliveHandler(threading.Thread):
self._last_ack = ack_time self._last_ack = ack_time
self.latency = ack_time - self._last_send self.latency = ack_time - self._last_send
if self.latency > 10: if self.latency > 10:
log.warning(self.behind_msg, self.latency) log.warning(self.behind_msg, self.shard_id, self.latency)
class VoiceKeepAliveHandler(KeepAliveHandler): class VoiceKeepAliveHandler(KeepAliveHandler):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
self.recent_ack_latencies = deque(maxlen=20) self.recent_ack_latencies = deque(maxlen=20)
self.msg = 'Keeping voice websocket alive with timestamp %s.' self.msg = 'Keeping shard ID %s voice websocket alive with timestamp %s.'
self.block_msg = 'Voice heartbeat blocked for more than %s seconds' self.block_msg = 'Shard ID %s voice heartbeat blocked for more than %s seconds'
self.behind_msg = 'High socket latency, heartbeat is %.1fs behind' self.behind_msg = 'High socket latency, shard ID %s heartbeat is %.1fs behind'
def get_payload(self): def get_payload(self):
return { return {