merge dev

This commit is contained in:
Josh Hawkins 2025-05-06 09:06:59 -05:00
parent c76725bb38
commit 6b0134aaca

View File

@ -48,7 +48,7 @@ class OnvifController:
self.ptz_metrics = ptz_metrics self.ptz_metrics = ptz_metrics
# Create a dedicated event loop and run it in a separate thread # Create a dedicated event loop and run it in a separate thread
self.loop = asyncio.get_event_loop() self.loop = asyncio.new_event_loop()
self.loop_thread = threading.Thread(target=self._run_event_loop, daemon=True) self.loop_thread = threading.Thread(target=self._run_event_loop, daemon=True)
self.loop_thread.start() self.loop_thread.start()
@ -63,7 +63,7 @@ class OnvifController:
def _run_event_loop(self) -> None: def _run_event_loop(self) -> None:
"""Run the event loop in a separate thread.""" """Run the event loop in a separate thread."""
# asyncio.set_event_loop(self.loop) asyncio.set_event_loop(self.loop)
try: try:
self.loop.run_forever() self.loop.run_forever()
except Exception as e: except Exception as e:
@ -88,7 +88,7 @@ class OnvifController:
"features": [], "features": [],
"presets": {}, "presets": {},
} }
except (Fault, ONVIFError, TransportError, Exception) as e: except (Fault, ONVIFError, Exception, TransportError) as e:
logger.error( logger.error(
f"Failed to create ONVIF camera instance for {cam_name}: {e}" f"Failed to create ONVIF camera instance for {cam_name}: {e}"
) )