From 994f1e7eedd6543458ad8ddac6109924aef37e11 Mon Sep 17 00:00:00 2001 From: Gregorius Soedharmo Date: Mon, 27 Feb 2023 02:46:35 +0700 Subject: [PATCH] Append message content to deadletter log message (#6448) Co-authored-by: Aaron Stannard --- src/core/Akka/Event/DeadLetterListener.cs | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/core/Akka/Event/DeadLetterListener.cs b/src/core/Akka/Event/DeadLetterListener.cs index 193637fb28a..f554a6cdd02 100644 --- a/src/core/Akka/Event/DeadLetterListener.cs +++ b/src/core/Akka/Event/DeadLetterListener.cs @@ -200,12 +200,19 @@ private void LogDeadLetter(AllDeadLetters d, string doneMsg) $"If this is not an expected behavior then {d.Recipient} may have terminated unexpectedly. "; break; } - _eventStream.Publish(new Info( - d.Recipient.Path.ToString(), - d.Recipient.GetType(), - logMessage + + + logMessage += "This logging can be turned off or adjusted with configuration settings 'akka.log-dead-letters' " + - "and 'akka.log-dead-letters-during-shutdown'.")); + "and 'akka.log-dead-letters-during-shutdown'."; + + // Check that unwrapped object has an overriden ToString() method + var content = unwrapped?.ToString() ?? "null"; + if (!content.Equals(messageStr)) + { + logMessage += $" Message content: {content}"; + } + + _eventStream.Publish(new Info(d.Recipient.Path.ToString(), d.Recipient.GetType(), logMessage)); } private bool IsReal(IActorRef snd)