RNS-Things/reticulum-meshchatX
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 8 Wiki Activity

time.sleep uses seconds not millis

Browse Source
This commit is contained in:
liamcottle
2025-02-07 19:49:20 +13:00
parent c0bb0763a1
commit ee08a5619c
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/interfaces/WebsocketClientInterface.py
View File

@@ -12,7 +12,7 @@ class WebsocketClientInterface(Interface):
# TODO: required? # TODO: required?
DEFAULT_IFAC_SIZE = 16 DEFAULT_IFAC_SIZE = 16
RECONNECT_DELAY_MILLIS = 5000 RECONNECT_DELAY_SECONDS = 5
def __str__(self): def __str__(self):
return f"WebsocketClientInterface[{self.name}/{self.target_host}:{self.target_port}]" return f"WebsocketClientInterface[{self.name}/{self.target_host}:{self.target_port}]"
@@ -103,13 +103,15 @@ class WebsocketClientInterface(Interface):
# connect to websocket server # connect to websocket server
try: try:
RNS.log(f"Establishing Websocket connection for {str(self)}...", RNS.LOG_DEBUG)
self.websocket = connect(f"{self.target_type}://{self.target_host}:{self.target_port}", max_size=None, compression=None) self.websocket = connect(f"{self.target_type}://{self.target_host}:{self.target_port}", max_size=None, compression=None)
self.read_loop() self.read_loop()
except Exception as e: except Exception as e:
RNS.log(f"{self} failed with error: {e}", RNS.LOG_ERROR) RNS.log(f"{self} failed with error: {e}", RNS.LOG_ERROR)
# auto reconnect after delay # auto reconnect after delay
time.sleep(self.RECONNECT_DELAY_MILLIS) RNS.log(f"Websocket disconnected for {str(self)}...", RNS.LOG_DEBUG)
time.sleep(self.RECONNECT_DELAY_SECONDS)
self.connect() self.connect()
def read_loop(self): def read_loop(self):

6
src/backend/interfaces/WebsocketServerInterface.py
View File

@@ -15,7 +15,7 @@ class WebsocketServerInterface(Interface):
# TODO: required? # TODO: required?
DEFAULT_IFAC_SIZE = 16 DEFAULT_IFAC_SIZE = 16
RESTART_DELAY_MILLIS = 5000 RESTART_DELAY_SECONDS = 5
def __str__(self): def __str__(self):
return f"WebsocketServerInterface[{self.name}/{self.listen_ip}:{self.listen_port}]" return f"WebsocketServerInterface[{self.name}/{self.listen_ip}:{self.listen_port}]"
@@ -126,6 +126,7 @@ class WebsocketServerInterface(Interface):
# run websocket server # run websocket server
try: try:
RNS.log(f"Starting Websocket server for {str(self)}...", RNS.LOG_DEBUG)
with serve(on_websocket_client_connected, self.listen_ip, self.listen_port, compression=None) as server: with serve(on_websocket_client_connected, self.listen_ip, self.listen_port, compression=None) as server:
self.online = True self.online = True
self.server = server self.server = server
@@ -135,7 +136,8 @@ class WebsocketServerInterface(Interface):
# websocket server is no longer running, let's restart it # websocket server is no longer running, let's restart it
self.online = False self.online = False
time.sleep(self.RESTART_DELAY_MILLIS) RNS.log(f"Websocket server stopped for {str(self)}...", RNS.LOG_DEBUG)
time.sleep(self.RESTART_DELAY_SECONDS)
self.serve() self.serve()
def detach(self): def detach(self):