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

Simplify handle_client loop / indent, check for EOF when reading from…
2023-07-02 18:18:48 -04:00
parent 6bdff30283 479bd272e9
commit c85fa1e928
1 changed files with 238 additions and 235 deletions
@@ -341,15 +341,18 @@ def handle_client(conn, addr):
    global EXCLUDE_LIST
    # print(f"[NEW CONNECTION] {addr} connected.")

-    connected = True
-    while connected:
+    while True:
        msg_length = conn.recv(HEADER).decode(FORMAT)
-        if msg_length:
+        if not msg_length:
+            break
+
        msg_length = int(msg_length)
        msg = conn.recv(msg_length).decode(FORMAT)
+        if not msg:
+            break
        if msg == DISCONNECT_MESSAGE:
-                connected = False
-            else:
+            break
+
        # print(f"[{addr}] {msg}")

        args = type('', (), {})()