From a671405fdfc52421d5bc9186138b9ac919de5e9d Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Fri, 22 Jul 2022 10:50:07 -0400 Subject: [PATCH] Add nodeid to logs in OperationalDeviceProxy.cpp (#21019) --- src/app/OperationalDeviceProxy.cpp | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/src/app/OperationalDeviceProxy.cpp b/src/app/OperationalDeviceProxy.cpp index 33373f79996a88..0e85731a6750d6 100644 --- a/src/app/OperationalDeviceProxy.cpp +++ b/src/app/OperationalDeviceProxy.cpp @@ -169,7 +169,11 @@ void OperationalDeviceProxy::UpdateDeviceData(const Transport::PeerAddress & add char peerAddrBuff[Transport::PeerAddress::kMaxToStringSize]; addr.ToString(peerAddrBuff); - ChipLogDetail(Controller, "Updating device address to %s while in state %d", peerAddrBuff, static_cast(mState)); + ChipLogDetail(Discovery, + "OperationalDeviceProxy[" ChipLogFormatX64 ":" ChipLogFormatX64 + "]: Updating device address to %s while in state %d", + ChipLogValueX64(mPeerId.GetCompressedFabricId()), ChipLogValueX64(mPeerId.GetNodeId()), peerAddrBuff, + static_cast(mState)); #endif CHIP_ERROR err = CHIP_NO_ERROR; @@ -366,7 +370,10 @@ OperationalDeviceProxy::~OperationalDeviceProxy() { if (mAddressLookupHandle.IsActive()) { - ChipLogProgress(Discovery, "Cancelling incomplete address resolution as device is being deleted."); + ChipLogDetail(Discovery, + "OperationalDeviceProxy[" ChipLogFormatX64 ":" ChipLogFormatX64 + "]: Cancelling incomplete address resolution as device is being deleted.", + ChipLogValueX64(mPeerId.GetCompressedFabricId()), ChipLogValueX64(mPeerId.GetNodeId())); // Skip cancel callback since the destructor is being called, so we assume that this object is // obviously not used anymore @@ -391,7 +398,10 @@ CHIP_ERROR OperationalDeviceProxy::LookupPeerAddress() // MoveToState calls in this method. if (mAddressLookupHandle.IsActive()) { - ChipLogProgress(Discovery, "Operational node lookup already in progress. Will NOT start a new one."); + ChipLogProgress(Discovery, + "OperationalDeviceProxy[" ChipLogFormatX64 ":" ChipLogFormatX64 + "]: Operational node lookup already in progress. Will NOT start a new one.", + ChipLogValueX64(mPeerId.GetCompressedFabricId()), ChipLogValueX64(mPeerId.GetNodeId())); return CHIP_NO_ERROR; } @@ -407,8 +417,10 @@ void OperationalDeviceProxy::OnNodeAddressResolved(const PeerId & peerId, const void OperationalDeviceProxy::OnNodeAddressResolutionFailed(const PeerId & peerId, CHIP_ERROR reason) { - ChipLogError(Discovery, "Operational discovery failed for 0x" ChipLogFormatX64 ": %" CHIP_ERROR_FORMAT, - ChipLogValueX64(peerId.GetNodeId()), reason.Format()); + ChipLogError(Discovery, + "OperationalDeviceProxy[" ChipLogFormatX64 ":" ChipLogFormatX64 + "]: operational discovery failed: %" CHIP_ERROR_FORMAT, + ChipLogValueX64(mPeerId.GetCompressedFabricId()), ChipLogValueX64(mPeerId.GetNodeId()), reason.Format()); if (IsResolvingAddress()) {