better error handling

mrlt8 · Sep 3, 2023 · 080f7a3 · 080f7a3
1 parent 7d84dd9
commit 080f7a3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/app/wyzebridge/wyze_api.py b/app/wyzebridge/wyze_api.py
@@ -329,9 +329,9 @@ def get_events(self, macs: Optional[list] = None, last_ts: int = 0):
         except wyzecam.api.RateLimitError as ex:
             logger.error(f"[EVENTS] RateLimitError: {ex}, cooling down.")
             return ex.reset_by, []
-        except (wyzecam.api.WyzeAPIError, ValueError) as ex:
+        except Exception as ex:
             logger.error(f"[API] ERROR - {ex}")
-            return time() + 60, []
+            return time() + 120, []
 
     @authenticated
     def set_device_info(self, cam: WyzeCamera, params: dict):

diff --git a/app/wyzebridge/wyze_control.py b/app/wyzebridge/wyze_control.py
@@ -1,8 +1,7 @@
-import contextlib
 import socket
 from datetime import datetime, timedelta
 from multiprocessing import Queue
-from queue import Empty, Full
+from queue import Empty
 from re import findall
 from typing import Any, Optional
 
@@ -274,6 +273,8 @@ def send_tutk_msg(sess: WyzeIOTCSession, cmd: tuple | str, log: str = "info") ->
             return _response(resp, res, params, log)
     except Empty:
         return _response(resp, log=log)
+    except tutk_protocol.TutkWyzeProtocolError as ex:
+        return resp | _error_response(cmd, tutk_protocol.TutkWyzeProtocolError(ex))
     except Exception as ex:
         return resp | _error_response(cmd, ex)