Skip to content
Snippets Groups Projects
Unverified Commit 36585558 authored by Alexei Chetroi's avatar Alexei Chetroi Committed by GitHub
Browse files

Refactor ZHA channel logging (#30259)

Add channel.id property -- id unique for this the device only.
parent 08af9896
No related branches found
No related tags found
No related merge requests found
...@@ -89,19 +89,19 @@ class ZigbeeChannel(LogMixin): ...@@ -89,19 +89,19 @@ class ZigbeeChannel(LogMixin):
self._generic_id = f"channel_0x{cluster.cluster_id:04x}" self._generic_id = f"channel_0x{cluster.cluster_id:04x}"
self._cluster = cluster self._cluster = cluster
self._zha_device = device self._zha_device = device
self._unique_id = "{}:{}:0x{:04x}".format( self._id = f"{cluster.endpoint.endpoint_id}:0x{cluster.cluster_id:04x}"
str(device.ieee), cluster.endpoint.endpoint_id, cluster.cluster_id self._unique_id = f"{str(device.ieee)}:{self._id}"
)
# this keeps logs consistent with zigpy logging
self._log_id = "0x{:04x}:{}:0x{:04x}".format(
device.nwk, cluster.endpoint.endpoint_id, cluster.cluster_id
)
self._report_config = CLUSTER_REPORT_CONFIGS.get( self._report_config = CLUSTER_REPORT_CONFIGS.get(
self._cluster.cluster_id, self.REPORT_CONFIG self._cluster.cluster_id, self.REPORT_CONFIG
) )
self._status = ChannelStatus.CREATED self._status = ChannelStatus.CREATED
self._cluster.add_listener(self) self._cluster.add_listener(self)
@property
def id(self) -> str:
"""Return channel id unique for this device only."""
return self._id
@property @property
def generic_id(self): def generic_id(self):
"""Return the generic id for this channel.""" """Return the generic id for this channel."""
...@@ -263,8 +263,8 @@ class ZigbeeChannel(LogMixin): ...@@ -263,8 +263,8 @@ class ZigbeeChannel(LogMixin):
def log(self, level, msg, *args): def log(self, level, msg, *args):
"""Log a message.""" """Log a message."""
msg = "[%s]: " + msg msg = "[%s:%s]: " + msg
args = (self._log_id,) + args args = (self.device.nwk, self._id,) + args
_LOGGER.log(level, msg, *args) _LOGGER.log(level, msg, *args)
def __getattr__(self, name): def __getattr__(self, name):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment