chickliu/ha_xiaomi_home
1
0
Fork 0
mirror of https://github.com/XiaoMi/ha_xiaomi_home.git synced 2026-01-17 07:10:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix thread naming

Browse Source
This commit is contained in:
Feng Wang 2024-12-23 16:59:45 +08:00
parent 23bf6817b9
commit d1c49bdf7b
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
custom_components/xiaomi_home/miot/miot_mips.py
View File

@ -227,7 +227,7 @@ class _MipsClient(ABC):
_event_connect: asyncio.Event _event_connect: asyncio.Event
_event_disconnect: asyncio.Event _event_disconnect: asyncio.Event
_internal_loop: asyncio.AbstractEventLoop _internal_loop: asyncio.AbstractEventLoop
_mips_thread: threading.Thread _mips_thread: threading.Thread | None = None
_mips_reconnect_tag: bool _mips_reconnect_tag: bool
_mips_reconnect_interval: float _mips_reconnect_interval: float
_mips_reconnect_timer: Optional[asyncio.TimerHandle] _mips_reconnect_timer: Optional[asyncio.TimerHandle]
@ -302,20 +302,23 @@ class _MipsClient(ABC):
""" """
return self._mqtt and self._mqtt.is_connected() return self._mqtt and self._mqtt.is_connected()
@final def connect(self, thread_name: Optional[str] = None) -> None:
def connect(self) -> None:
"""mips connect.""" """mips connect."""
# Start mips thread # Start mips thread
if self._mips_thread:
return
self._internal_loop = asyncio.new_event_loop() self._internal_loop = asyncio.new_event_loop()
self._mips_thread = threading.Thread(target=self.__mips_loop_thread) self._mips_thread = threading.Thread(target=self.__mips_loop_thread)
self._mips_thread.daemon = True self._mips_thread.daemon = True
self._mips_thread.name = self._client_id self._mips_thread.name = \
self._client_id if thread_name is None else thread_name
self._mips_thread.start() self._mips_thread.start()
@final @final
def close(self) -> None: def close(self) -> None:
self._internal_loop.call_soon_threadsafe(self.__mips_close) self._internal_loop.call_soon_threadsafe(self.__mips_close)
self._mips_thread.join() if self._mips_thread:
self._mips_thread.join()
self._internal_loop.close() self._internal_loop.close()
self._logger = None self._logger = None
@ -1066,8 +1069,6 @@ class MipsLocalClient(_MipsClient):
super().__init__( super().__init__(
client_id=did, host=host, port=port, client_id=did, host=host, port=port,
ca_file=ca_file, cert_file=cert_file, key_file=key_file, loop=loop) ca_file=ca_file, cert_file=cert_file, key_file=key_file, loop=loop)
# MIPS local thread name use group_id
self._mips_thread.name = self._group_id
@property @property
def group_id(self) -> str: def group_id(self) -> str:
@ -1085,6 +1086,11 @@ class MipsLocalClient(_MipsClient):
if self._logger: if self._logger:
self._logger.error(f'{self._home_name}, '+msg, *args, **kwargs) self._logger.error(f'{self._home_name}, '+msg, *args, **kwargs)
@final
def connect(self, thread_name: Optional[str] = None) -> None:
# MIPS local thread name use group_id
super().connect(self._group_id)
@final @final
def disconnect(self) -> None: def disconnect(self) -> None:
super().disconnect() super().disconnect()