Browse Source

Add dispatch queue name in pipe invocation log messages

Antoine Blanchet 7 years ago
parent
commit
c4eaa5f190

+ 7 - 4
src/Abc.Zebus/Core/BusMessageLogger.cs

@@ -2,6 +2,7 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Reflection;
+using Abc.Zebus.Scan;
 using Abc.Zebus.Util.Annotations;
 using Abc.Zebus.Util.Extensions;
 using log4net;
@@ -44,7 +45,7 @@ namespace Abc.Zebus.Core
             => _logInfoEnabled && GetLogInfo(message).Logger.IsInfoEnabled;
 
         [StringFormatMethod("format")]
-        public void InfoFormat(string format, IMessage message, MessageId? messageId = null, long messageSize = 0, PeerId peerId = default(PeerId))
+        public void InfoFormat(string format, IMessage message, string dispatchQueueName = null, MessageId? messageId = null, long messageSize = 0, PeerId peerId = default(PeerId))
         {
             if (!_logInfoEnabled)
                 return;
@@ -54,7 +55,9 @@ namespace Abc.Zebus.Core
                 return;
 
             var messageText = logInfo.GetMessageText(message);
-            _logger.InfoFormat(format, messageText, messageId, messageSize, peerId);
+            dispatchQueueName = string.IsNullOrEmpty(dispatchQueueName) || dispatchQueueName == DispatchQueueNameScanner.DefaultQueueName ? string.Empty : $" [{dispatchQueueName}] ";
+
+            _logger.InfoFormat(format, messageText, dispatchQueueName, messageId, messageSize, peerId);
         }
 
         [StringFormatMethod("format")]
@@ -80,11 +83,11 @@ namespace Abc.Zebus.Core
             switch (peers.Count)
             {
                 case 0:
-                    InfoFormat(format, message, messageId, messageSize);
+                    InfoFormat(format, message, messageId: messageId, messageSize: messageSize);
                     return;
 
                 case 1:
-                    InfoFormat(format, message, messageId, messageSize, peers[0].Id);
+                    InfoFormat(format, message, messageId: messageId, messageSize:messageSize, peerId:peers[0].Id);
                     return;
             }
 

+ 2 - 2
src/Abc.Zebus/Dispatch/Pipes/PipeInvocation.cs

@@ -100,14 +100,14 @@ namespace Abc.Zebus.Dispatch.Pipes
 
         IDisposable IMessageHandlerInvocation.SetupForInvocation()
         {
-            _messageLogger.InfoFormat("HANDLE: {0} [{1}]", _messages[0], _messageContext.MessageId);
+            _messageLogger.InfoFormat("HANDLE{1}: {0} [{2}]", _messages[0], _invoker.DispatchQueueName, _messageContext.MessageId);
 
             return MessageContext.SetCurrent(_messageContext);
         }
 
         IDisposable IMessageHandlerInvocation.SetupForInvocation(object messageHandler)
         {
-            _messageLogger.InfoFormat("HANDLE: {0} [{1}]", _messages[0], _messageContext.MessageId);
+            _messageLogger.InfoFormat("HANDLE{1}: {0} [{2}]", _messages[0], _invoker.DispatchQueueName, _messageContext.MessageId);
 
             ApplyMutations(messageHandler);