Merge pull request #965 from srd424/serverpy-fix-2

Simplify handle_client loop / indent, check for EOF when reading from…
This commit is contained in:
ehpersonal38
2023-07-02 18:18:48 -04:00
committed by GitHub
+8 -5
View File
@@ -341,15 +341,18 @@ def handle_client(conn, addr):
global EXCLUDE_LIST global EXCLUDE_LIST
# print(f"[NEW CONNECTION] {addr} connected.") # print(f"[NEW CONNECTION] {addr} connected.")
connected = True while True:
while connected:
msg_length = conn.recv(HEADER).decode(FORMAT) msg_length = conn.recv(HEADER).decode(FORMAT)
if msg_length: if not msg_length:
break
msg_length = int(msg_length) msg_length = int(msg_length)
msg = conn.recv(msg_length).decode(FORMAT) msg = conn.recv(msg_length).decode(FORMAT)
if not msg:
break
if msg == DISCONNECT_MESSAGE: if msg == DISCONNECT_MESSAGE:
connected = False break
else:
# print(f"[{addr}] {msg}") # print(f"[{addr}] {msg}")
args = type('', (), {})() args = type('', (), {})()