commit d9cbc1f754dfad80e490d45ecd0f82300acb0f5e
author Boris Zbarsky <bzbarsky@apple.com> Thu May 09 14:09:32 2024 -0400
committer GitHub <noreply@github.com> Thu May 09 18:09:32 2024 +0000
tree 6186480aad66ddec61ed2c1a097a84a4754577ee
parent d1d0d2bb4eaaa5fa19643f39c511bb80b6c296fd

Improve server logging on subscription failures. (#33372)

* Improve server logging on subscription failures.

1) When logging "session inactive", log which session it is.
2) When a subscription ReadHandler closes, log the relevant subscription ID and
   peer node.

* Address review comment.

src/app/ReadHandler.cpp

diff --git a/src/app/ReadHandler.cpp b/src/app/ReadHandler.cpp
index 461add0..dd4c928 100644
--- a/src/app/ReadHandler.cpp
+++ b/src/app/ReadHandler.cpp
@@ -175,6 +175,16 @@
         }
     }
 #endif // CHIP_CONFIG_PERSIST_SUBSCRIPTIONS
+
+#if CHIP_PROGRESS_LOGGING
+    if (IsType(InteractionType::Subscribe))
+    {
+        const ScopedNodeId & peer = mSessionHandle ? mSessionHandle->GetPeer() : ScopedNodeId();
+        ChipLogProgress(DataManagement, "Subscription id 0x%" PRIx32 " from node " ChipLogFormatScopedNodeId " torn down",
+                        mSubscriptionId, ChipLogValueScopedNodeId(peer));
+    }
+#endif // CHIP_PROGRESS_LOGGING
+
     MoveToState(HandlerState::AwaitingDestruction);
     mManagementCallback.OnDone(*this);
 }

src/messaging/ExchangeMgr.cpp

diff --git a/src/messaging/ExchangeMgr.cpp b/src/messaging/ExchangeMgr.cpp
index a184723..c60b948 100644
--- a/src/messaging/ExchangeMgr.cpp
+++ b/src/messaging/ExchangeMgr.cpp
@@ -106,8 +106,13 @@
 {
     if (!session->IsActiveSession())
     {
+#if CHIP_ERROR_LOGGING
+        const ScopedNodeId & peer = session->GetPeer();
+        ChipLogError(ExchangeManager, "NewContext failed: session %u to " ChipLogFormatScopedNodeId " is inactive",
+                     session->SessionIdForLogging(), ChipLogValueScopedNodeId(peer));
+#endif // CHIP_ERROR_LOGGING
+
         // Disallow creating exchange on an inactive session
-        ChipLogError(ExchangeManager, "NewContext failed: session inactive");
         return nullptr;
     }
     return mContextPool.CreateObject(this, mNextExchangeId++, session, isInitiator, delegate);