Skip to content

Commit c52c9c3

Browse files
committed
Revert to async-original-like, add debug-logging to registry-register_node()
1 parent 9860762 commit c52c9c3

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

plugwise_usb/network/__init__.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,12 +152,10 @@ async def register_node(self, mac: str) -> bool:
152152
return False
153153

154154
try:
155-
if (address := await self._register.register_node(mac)):
156-
return await self._discover_node(address, mac, None)
155+
address = await self._register.register_node(mac)
156+
return await self._discover_node(address, mac, None)
157157
except (MessageError, NodeError) as exc:
158158
raise NodeError(f"{exc}") from exc
159-
160-
return False
161159

162160
async def clear_cache(self) -> None:
163161
"""Clear register cache."""

plugwise_usb/network/registry.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,8 +251,9 @@ async def register_node(self, mac: str) -> int:
251251
request = NodeAddRequest(self._send_to_controller, bytes(mac, UTF8), True)
252252
try:
253253
response = await request.send()
254-
if response is None or response.response_type != NodeResponseType.REJOINING:
255-
raise NodeError(f"Failed to register node {mac}, no or wrong response")
254+
if response is None:
255+
raise NodeError(f"Failed to register node {mac}, no response received")
256+
_LOGGER.debug("register_node | response ack_id: %s", response.ack_id)
256257
except MessageError as exc:
257258
raise MessageError(f"Failed to register Node with {mac}") from exc
258259

0 commit comments

Comments
 (0)