swee/IRCat
swee/IRCat
1
0
Fork 0
Code Issues Pull requests Activity

Update server.py
Some checks are pending
Check syntax / check (push) Waiting to run

Browse source
This commit is contained in:
Nova Cat 2025-01-06 15:38:03 -08:00
parent 18b2987958
commit 60538d1436
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
server.py
View file

@ -129,7 +129,14 @@ def pinger(nick, connection):
print("Sent ping message to " + nick) print("Sent ping message to " + nick)
property_list[nick]["ping_pending"] = True property_list[nick]["ping_pending"] = True
time.sleep(0.5) time.sleep(0.5)
connection.sendall(bytes(f"PING {server}\r\n","UTF-8")) try:
connection.sendall(bytes(f"PING {server}\r\n","UTF-8"))
except Exception as ex:
property_list[nick]["cause"] = "Send error: " + str(ex)
print("SHUTTING DOWN FOR " + nick)
connection.shutdown(socket.SHUT_WR)
connection.close()
break
elif property_list[nick]["ping_pending"] and ((time.time() - property_list[nick]["last_ping"]) > ping_timeout): elif property_list[nick]["ping_pending"] and ((time.time() - property_list[nick]["last_ping"]) > ping_timeout):
if nick in property_list: if nick in property_list:
property_list[nick]["cause"] = f"Ping timeout: {ping_timeout} seconds" property_list[nick]["cause"] = f"Ping timeout: {ping_timeout} seconds"
@ -169,6 +176,9 @@ def session(connection, client, ip, ssl=False):
while True: while True:
try: try:
data = connection.recv(2048) data = connection.recv(2048)
if not data:
cause = "Remote host closed the connection"
break
except Exception as ex: except Exception as ex:
cause = "Read error: " + str(ex) cause = "Read error: " + str(ex)
break break
@ -564,11 +574,7 @@ def session(connection, client, ip, ssl=False):
except Exception as ex: except Exception as ex:
print(traceback.format_exc()) print(traceback.format_exc())
cause = "Read error: " + str(ex) cause = "Internal IRCat error: " + str(ex)
break
if not data:
cause = "Remote host closed the connection"
break break
finally: finally:
connection.close() connection.close()