diff --git a/sunnypilot/sunnylink/api.py b/sunnypilot/sunnylink/api.py index bda97262c..5260f6bd9 100644 --- a/sunnypilot/sunnylink/api.py +++ b/sunnypilot/sunnylink/api.py @@ -30,10 +30,6 @@ class SunnylinkApi(BaseApi): return super().api_get(endpoint, method, timeout, access_token, session, json, **kwargs) - def resume_queued(self, timeout=10, **kwargs): - sunnylinkId, commaId = self._resolve_dongle_ids() - return self.api_get(f"ws/{sunnylinkId}/resume_queued", "POST", timeout, access_token=self.get_token(), **kwargs) - def get_token(self, payload_extra=None, expiry_hours=1): # Add your additional data here additional_data = {} diff --git a/sunnypilot/sunnylink/athena/sunnylinkd.py b/sunnypilot/sunnylink/athena/sunnylinkd.py index 39fe5679c..2e262c33b 100755 --- a/sunnypilot/sunnylink/athena/sunnylinkd.py +++ b/sunnypilot/sunnylink/athena/sunnylinkd.py @@ -64,7 +64,6 @@ def handle_long_poll(ws: WebSocket, exit_event: threading.Event | None) -> None: threading.Thread(target=ws_recv, args=(ws, end_event), name='ws_recv'), threading.Thread(target=ws_send, args=(ws, end_event), name='ws_send'), threading.Thread(target=ws_ping, args=(ws, end_event), name='ws_ping'), - threading.Thread(target=ws_queue, args=(end_event,), name='ws_queue'), threading.Thread(target=upload_handler, args=(end_event,), name='upload_handler'), threading.Thread(target=sunny_log_handler, args=(end_event, comma_prime_cellular_end_event), name='log_handler'), threading.Thread(target=stat_handler, args=(end_event, Paths.stats_sp_root(), True), name='stat_handler'), @@ -147,37 +146,6 @@ def ws_ping(ws: WebSocket, end_event: threading.Event) -> None: cloudlog.debug("sunnylinkd.ws_ping.end_event is set, exiting ws_ping thread") -def ws_queue(end_event: threading.Event) -> None: - sunnylink_dongle_id = params.get("SunnylinkDongleId") - sunnylink_api = SunnylinkApi(sunnylink_dongle_id) - resume_requested = False - tries = 0 - - while not end_event.is_set() and not resume_requested: - try: - if not resume_requested: - cloudlog.debug("sunnylinkd.ws_queue.resume_queued") - sunnylink_api.resume_queued(timeout=29) - resume_requested = True - tries = 0 - except Exception as e: - if isinstance(e, (ConnectionError, TimeoutError)): - cloudlog.warning(f"sunnylinkd.ws_queue.resume_queued.{type(e).__name__}") - else: - cloudlog.exception("sunnylinkd.ws_queue.resume_queued.exception") - - resume_requested = False - tries += 1 - time.sleep(backoff(tries)) - - if end_event.is_set(): - cloudlog.debug("end_event is set, exiting ws_queue thread") - elif resume_requested: - cloudlog.debug(f"Resume requested to server after {tries} tries") - else: - cloudlog.error(f"Reached end of ws_queue while end_event is not set and resume_requested is {resume_requested}") - - def sunny_log_handler(end_event: threading.Event, comma_prime_cellular_end_event: threading.Event) -> None: while not end_event.wait(0.1): if not comma_prime_cellular_end_event.is_set():