Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add nodeid to logs in OperationalDeviceProxy.cpp #21019

Merged
merged 3 commits into from
Jul 22, 2022
Merged

Add nodeid to logs in OperationalDeviceProxy.cpp #21019

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f213acf
Add nodeid to logs in OperationalDeviceProxy.cpp
andy31415 Jul 20, 2022
36ff405
Merge branch 'master' into logs_in_operational_device_proxy
andy31415 Jul 21, 2022
4ab8eb8
Updated logging to include full node information
andy31415 Jul 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions src/app/OperationalDeviceProxy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<int>(mState));
ChipLogDetail(Discovery,
"OperationalDeviceProxy[" ChipLogFormatX64 ":" ChipLogFormatX64
"]: Updating device address to %s while in state %d",
ChipLogValueX64(mPeerId.GetCompressedFabricId()), ChipLogValueX64(mPeerId.GetNodeId()), peerAddrBuff,
static_cast<int>(mState));
#endif

CHIP_ERROR err = CHIP_NO_ERROR;
Expand Down Expand Up @@ -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
Expand All @@ -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;
}

Expand All @@ -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())
{
Expand Down