user333/irc2bash
1
0
Fork 0
mirror of https://github.com/a-bad-dev/irc2bash.git synced 2026-06-09 00:51:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improve ping support to avoid ping timeouts

Browse source 
Specifically the ping is moved to the message throttling code so that every 10th
message triggers a ping.

This also allows for me to remove the multiple ping handlers.
This commit is contained in:
Jordyn 2026-03-14 03:47:00 -05:00
commit c1d9da8ef8
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
main.py
View file

@ -63,7 +63,9 @@ class Server():
def die(self, msg = "Python3 Server() outta here!"): def die(self, msg = "Python3 Server() outta here!"):
print("[SERVER/MAINTHREAD] Sending PART and QUIT") print("[SERVER/MAINTHREAD] Sending PART and QUIT")
# Part all of our channels with a cool message, then quit # Part all of our channels with a cool message, then quit
self._msg_q.put(f"PART {self.channel} : {msg}\r\n".encode()) for channel in self.channels:
self._msg_q.put(f"PART {channel} : {msg}\r\n".encode())
self._msg_q.put(f"QUIT : {msg}\r\n".encode()) self._msg_q.put(f"QUIT : {msg}\r\n".encode())
print("[SERVER/MAINTHREAD] Signaling threads to quit!") print("[SERVER/MAINTHREAD] Signaling threads to quit!")
@ -79,6 +81,8 @@ class Server():
print(f"[SENDTHREAD] Sleeping for {self._msg_time} seconds on message count {self._msg_count}") print(f"[SENDTHREAD] Sleeping for {self._msg_time} seconds on message count {self._msg_count}")
time.sleep(self._msg_time) time.sleep(self._msg_time)
if self._msg_count == 10: if self._msg_count == 10:
print("[SENDTHREAD] Sending ping on 10th message!")
self.sock.send(f"PING :{ip}\r\n".encode())
self._msg_count = 0 self._msg_count = 0
# Grab message and send it # Grab message and send it
@ -86,8 +90,7 @@ class Server():
msg = self._msg_q.get(timeout = 60) msg = self._msg_q.get(timeout = 60)
except queue.Empty: except queue.Empty:
# So the thread signaler works # So the thread signaler works
print("[SENDTHREAD] Timeout occurred waiting on queue... sending ping!") continue
self.sock.send(f"PING :{ip}\r\n".encode())
print(f"[SENDTHREAD] Sending message: {msg}") print(f"[SENDTHREAD] Sending message: {msg}")
try: try:
@ -121,10 +124,7 @@ class Server():
print("[RECVTHREAD] Message: {data}") print("[RECVTHREAD] Message: {data}")
continue continue
except socket.timeout: except socket.timeout:
# Instead of using another thread, I just use a socket timeout to send pings # So threading Events work
# Kills two birds with one stone as we can't wait forever due to threading Events
print("[RECVTHREAD] Timeout occurred waiting on server messages... sending ping!")
self.sock.send(f"PING :{ip}\r\n".encode())
continue continue
# Handle IRC messages # Handle IRC messages
@ -288,7 +288,7 @@ class Server():
# Calculate maximum message size # Calculate maximum message size
# 512 bytes is max IRC message with <IRCv3 and no cap neg # 512 bytes is max IRC message with <IRCv3 and no cap neg
msg_without_data = b"PRIVMSG " + self.channel.encode() + b" :" + b"\r\n" msg_without_data = b"PRIVMSG " + target_channel.encode() + b" :" + b"\r\n"
max_data_len = 512 - len(msg_without_data) max_data_len = 512 - len(msg_without_data)
print(f"[CMDTHREAD] Reading from Popen pipe with len = {max_data_len}!") print(f"[CMDTHREAD] Reading from Popen pipe with len = {max_data_len}!")