alienhunter/packetserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing connectionmanager bug, increasing new connection timeout.

Browse Source
This commit is contained in:
Michael Woods
2025-02-15 15:29:37 -05:00
parent 6ea0d5e698
commit ce84d3b56f
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/packetserver/client/__init__.py
View File

@@ -40,15 +40,19 @@ class Client:
self.started = True self.started = True
def clear_connections(self): def clear_connections(self):
cm = self.app._engine._active_handler._handlers[1]._connection_map
for key in cm._connections.keys(): for key in cm._connections.keys():
cm._connections[key].close() cm._connections[key].close()
def new_connection(self, dest: str): def new_connection(self, dest: str) -> PacketServerConnection:
if not self.started: if not self.started:
raise RuntimeError("Must start client before creating connections.") raise RuntimeError("Must start client before creating connections.")
if not ax25.Address.valid_call(dest): if not ax25.Address.valid_call(dest):
raise ValueError(f"Provided destination callsign '{dest}' is invalid.") raise ValueError(f"Provided destination callsign '{dest}' is invalid.")
return self.app.open_connection(0, self.callsign, dest) conn = self.app.open_connection(0, self.callsign, dest)
logging.debug("Allowing connection to stabilize for 3 seconds")
time.sleep(8)
return conn
def send_and_receive(self, req: Request, conn: PacketServerConnection, timeout: int = 300) -> Optional[Response]: def send_and_receive(self, req: Request, conn: PacketServerConnection, timeout: int = 300) -> Optional[Response]:
if conn.state.name != "CONNECTED": if conn.state.name != "CONNECTED":
@@ -79,8 +83,6 @@ class Client:
logging.error(f"Connection {conn} disconnected.") logging.error(f"Connection {conn} disconnected.")
return None return None
logging.debug("Allowing connection to stabilize for 3 seconds")
time.sleep(3)
remaining_time = int((cutoff_date - datetime.datetime.now()).total_seconds()) + 1 remaining_time = int((cutoff_date - datetime.datetime.now()).total_seconds()) + 1
if remaining_time <= 0: if remaining_time <= 0:
logging.debug("Connection attempt timed out.") logging.debug("Connection attempt timed out.")