it's finally working properly

pytmtc/pyserver.py

@@ -4,7 +4,8 @@ import abc
 import time
 import select
 import logging
-from threading import Thread
+from typing import Any
+from threading import Event, Thread
 from collections import deque
 from multiprocessing import Queue
 from spacepackets.ccsds.spacepacket import parse_space_packets, PacketId
@@ -21,6 +22,7 @@ LOG_LEVEL = logging.DEBUG
 
 TC_QUEUE = Queue()
 TM_QUEUE = Queue()
+KILL_SIGNAL = Event()
 
 
 _LOGGER = logging.getLogger(__name__)
@@ -33,10 +35,17 @@ def main():
         datefmt="%Y-%m-%d %H:%M:%S",
     )
     print("Starting OPS-SAT ground TMTC server")
+    KILL_SIGNAL.clear()
     ops_sat_thread = OpsSatServer()
     ops_sat_thread.start()
     tmtc_thread = TmtcServer()
     tmtc_thread.start()
+    try:
+        while True:
+            time.sleep(1)
+    except KeyboardInterrupt:
+        _LOGGER.info("Shutting down server gracefully")
+        KILL_SIGNAL.set()
     ops_sat_thread.join()
     tmtc_thread.join()
 
@@ -47,6 +56,8 @@ class BaseServer(Thread):
         self.server_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         server_addr = ("0.0.0.0", port)
         self.server_socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+        self.server_socket.setblocking(False)
+        self.server_socket.settimeout(0.4)
         self.server_socket.bind(server_addr)
         super().__init__()
 
@@ -54,29 +65,35 @@ class BaseServer(Thread):
         self.run_sync_version()
 
     def run_sync_version(self) -> None:
-        while True:
-            self.server_socket.listen()
-            (conn_socket, conn_addr) = self.server_socket.accept()
-            conn_socket.setblocking(False)
-            print(f"{self.log_prefix} TCP client {conn_addr} connected")
-            analysis_deque = deque()
-            while True:
-                conn_socket.settimeout(0.2)
-                try:
-                    bytes_recvd = conn_socket.recv(4096)
-                    if len(bytes_recvd) > 0:
-                        _LOGGER.debug(f"{self.log_prefix} RX RAW: {bytes_recvd}")
-                        analysis_deque.append(bytes_recvd)
-                    elif len(bytes_recvd) == 0:
-                        self.handle_read_bytestream(analysis_deque)
-                        break
-                    else:
-                        print("error receiving data from TCP client")
-                except BlockingIOError:
-                    self.handle_timeout(conn_socket, analysis_deque)
-                    time.sleep(0.2)
-                except TimeoutError:
-                    self.handle_timeout(conn_socket, analysis_deque)
+        self.server_socket.listen()
+        while True and not KILL_SIGNAL.is_set():
+            try:
+                (conn_socket, conn_addr) = self.server_socket.accept()
+                self.handle_connection(conn_socket, conn_addr)
+            except TimeoutError:
+                continue
+
+    def handle_connection(self, conn_socket: socket.socket, conn_addr: Any):
+        conn_socket.setblocking(False)
+        print(f"{self.log_prefix} TCP client {conn_addr} connected")
+        analysis_deque = deque()
+        while True and not KILL_SIGNAL.is_set():
+            conn_socket.settimeout(0.2)
+            try:
+                bytes_recvd = conn_socket.recv(4096)
+                if len(bytes_recvd) > 0:
+                    _LOGGER.debug(f"{self.log_prefix} RX RAW: {bytes_recvd}")
+                    analysis_deque.append(bytes_recvd)
+                elif len(bytes_recvd) == 0:
+                    self.handle_read_bytestream(analysis_deque)
+                    break
+                else:
+                    print("error receiving data from TCP client")
+            except BlockingIOError:
+                self.handle_timeout(conn_socket, analysis_deque)
+                time.sleep(0.2)
+            except TimeoutError:
+                self.handle_timeout(conn_socket, analysis_deque)
 
     def handle_timeout(self, conn_socket: socket.socket, analysis_deque: deque):
         if len(analysis_deque) > 0: