same timeout as the global websocket

pull/32336/head
Shane Smiskol 1 year ago
parent b5b1c22d8a
commit 0bd0cb8a38
  1. 13
      selfdrive/athena/athenad.py

@ -465,7 +465,8 @@ def startLocalProxy(global_end_event: threading.Event, remote_ws_uri: str, local
identity_token = Api(dongle_id).get_token()
ws = create_connection(remote_ws_uri,
cookie="jwt=" + identity_token,
enable_multithread=True)
enable_multithread=True,
timeout=30.0)
ssock, csock = socket.socketpair()
local_sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
@ -657,12 +658,10 @@ def stat_handler(end_event: threading.Event) -> None:
def ws_proxy_recv(ws: WebSocket, local_sock: socket.socket, ssock: socket.socket, end_event: threading.Event, global_end_event: threading.Event) -> None:
while not (end_event.is_set() or global_end_event.is_set()):
try:
r = select.select([ws], [], [], 10)
if r[0]:
data = ws.recv()
if isinstance(data, str):
data = data.encode("utf-8")
local_sock.sendall(data)
data = ws.recv()
if isinstance(data, str):
data = data.encode("utf-8")
local_sock.sendall(data)
except WebSocketTimeoutException:
pass
except Exception:

Loading…
Cancel
Save