github
/
ha-core
mirror of https://github.com/home-assistant/core
1
Fork 0
Code Releases Activity

Refactor ZHA channel logging (#30259) 

Add channel.id property -- id unique for this the device only.
This commit is contained in:
Alexei Chetroi 2019-12-28 15:41:55 -05:00 committed by GitHub
parent 08af989658
commit 36585558a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
homeassistant/components/zha/core/channels/__init__.py
View File

@ -89,19 +89,19 @@ class ZigbeeChannel(LogMixin):
self._generic_id = f"channel_0x{cluster.cluster_id:04x}"
self._cluster = cluster
self._zha_device = device
self._unique_id = "{}:{}:0x{:04x}".format(
str(device.ieee), cluster.endpoint.endpoint_id, cluster.cluster_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._id = f"{cluster.endpoint.endpoint_id}:0x{cluster.cluster_id:04x}"
self._unique_id = f"{str(device.ieee)}:{self._id}"
self._report_config = CLUSTER_REPORT_CONFIGS.get(
self._cluster.cluster_id, self.REPORT_CONFIG
)
self._status = ChannelStatus.CREATED
self._cluster.add_listener(self)
@property
def id(self) -> str:
"""Return channel id unique for this device only."""
return self._id
@property
def generic_id(self):
"""Return the generic id for this channel."""
@ -263,8 +263,8 @@ class ZigbeeChannel(LogMixin):
def log(self, level, msg, *args):
"""Log a message."""
msg = "[%s]: " + msg
args = (self._log_id,) + args
msg = "[%s:%s]: " + msg
args = (self.device.nwk, self._id,) + args
_LOGGER.log(level, msg, *args)
def __getattr__(self, name):