jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-19 03:07:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Core deadlock by ensuring only one ZHA log queue handler thread is running at a time (#142568)

Browse Source 
Ensure only one log queue handler is running at a time
This commit is contained in:
puddly 2025-04-08 22:02:51 -04:00 committed by GitHub
parent 528ca49368
commit 271a4ba7c8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
homeassistant/components/zha/helpers.py
View File

@ -514,6 +514,7 @@ class ZHAGatewayProxy(EventBase):
self._log_queue_handler.listener = logging.handlers.QueueListener( self._log_queue_handler.listener = logging.handlers.QueueListener(
log_simple_queue, log_relay_handler log_simple_queue, log_relay_handler
) )
self._log_queue_handler_count: int = 0
self._unsubs: list[Callable[[], None]] = [] self._unsubs: list[Callable[[], None]] = []
self._unsubs.append(self.gateway.on_all_events(self._handle_event_protocol)) self._unsubs.append(self.gateway.on_all_events(self._handle_event_protocol))
@ -747,7 +748,10 @@ class ZHAGatewayProxy(EventBase):
if filterer: if filterer:
self._log_queue_handler.addFilter(filterer) self._log_queue_handler.addFilter(filterer)
if self._log_queue_handler.listener: # Only start a new log queue handler if the old one is no longer running
self._log_queue_handler_count += 1
if self._log_queue_handler.listener and self._log_queue_handler_count == 1:
self._log_queue_handler.listener.start() self._log_queue_handler.listener.start()
for logger_name in DEBUG_RELAY_LOGGERS: for logger_name in DEBUG_RELAY_LOGGERS:
@ -763,7 +767,10 @@ class ZHAGatewayProxy(EventBase):
for logger_name in DEBUG_RELAY_LOGGERS: for logger_name in DEBUG_RELAY_LOGGERS:
logging.getLogger(logger_name).removeHandler(self._log_queue_handler) logging.getLogger(logger_name).removeHandler(self._log_queue_handler)
if self._log_queue_handler.listener: # Only stop the log queue handler if nothing else is using it
self._log_queue_handler_count -= 1
if self._log_queue_handler.listener and self._log_queue_handler_count == 0:
self._log_queue_handler.listener.stop() self._log_queue_handler.listener.stop()
if filterer: if filterer: