Fix logging debug

GrumpyBusted · GrumpyBusted · commit 817921f7f7a6 · 2018-02-04T17:56:29.000+01:00
diff --git a/Grumpy.MessageQueue.Msmq/Queue.cs b/Grumpy.MessageQueue.Msmq/Queue.cs
@@ -396,9 +396,9 @@ private void SendMessage<T>(T message, IMessageQueueTransaction messageQueueTran
         {
             var jsonSerializerSettings = new JsonSerializerSettings { TypeNameHandling = TypeNameHandling.All };
 
-            var body = new QueueMessage { MessageBody = message.SerializeToJson(jsonSerializerSettings), MessageType = typeof(T) }.SerializeToJson(jsonSerializerSettings);
+            var queueMessage = new QueueMessage { MessageBody = message.SerializeToJson(jsonSerializerSettings), MessageType = typeof(T) };
 
-            using (var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(body)))
+            using (var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(queueMessage.SerializeToJson(jsonSerializerSettings))))
             {
                 var buffer = new byte[MaxMsmqMessageSize];
                 var correlationId = "";
@@ -407,26 +407,26 @@ private void SendMessage<T>(T message, IMessageQueueTransaction messageQueueTran
                 int bytes;
                 var chunk = 0;
 
-                Logger.Debug("Message Send {QueueName} {Type} {%Message}", Name, typeof(T).FullName, body);
+                Logger.Debug("Message send {QueueName} {Type} {%Message}", Name, queueMessage.MessageType.FullName, queueMessage.MessageBody);
 
                 if (!Transactional && numberOfChunks > 1)
                     throw new MessageSizeException(memoryStream.Length, buffer.Length, Transactional);
 
                 while ((bytes = memoryStream.Read(buffer, 0, buffer.Length)) > 0)
                 {
-                    var queueMessage = new Message
+                    var mqMessage = new Message
                     {
                         AppSpecific = numberOfChunks,
                         CorrelationId = correlationId
                     };
 
-                    queueMessage.BodyStream.Write(buffer, 0, bytes);
+                    mqMessage.BodyStream.Write(buffer, 0, bytes);
 
                     Logger.Debug("Sending message chunk ({Chunk}/{NumberOfChunks}) on {QueueName} {CorrelationId}", ++chunk, numberOfChunks, Name, correlationId);
 
-                    MessageQueueManager.Send(MessageQueue, queueMessage, messageQueueTransaction?.Transaction);
+                    MessageQueueManager.Send(MessageQueue, mqMessage, messageQueueTransaction?.Transaction);
 
-                    correlationId = queueMessage.Id;
+                    correlationId = mqMessage.Id;
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -396,9 +396,9 @@ private void SendMessage<T>(T message, IMessageQueueTransaction messageQueueTran`
`396`	`396`	`{`
`397`	`397`	`var jsonSerializerSettings = new JsonSerializerSettings { TypeNameHandling = TypeNameHandling.All };`
`398`	`398`
`399`		`- var body = new QueueMessage { MessageBody = message.SerializeToJson(jsonSerializerSettings), MessageType = typeof(T) }.SerializeToJson(jsonSerializerSettings);`
	`399`	`+ var queueMessage = new QueueMessage { MessageBody = message.SerializeToJson(jsonSerializerSettings), MessageType = typeof(T) };`
`400`	`400`
`401`		`- using (var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(body)))`
	`401`	`+ using (var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(queueMessage.SerializeToJson(jsonSerializerSettings))))`
`402`	`402`	`{`
`403`	`403`	`var buffer = new byte[MaxMsmqMessageSize];`
`404`	`404`	`var correlationId = "";`
`@@ -407,26 +407,26 @@ private void SendMessage<T>(T message, IMessageQueueTransaction messageQueueTran`
`407`	`407`	`int bytes;`
`408`	`408`	`var chunk = 0;`
`409`	`409`
`410`		`- Logger.Debug("Message Send {QueueName} {Type} {%Message}", Name, typeof(T).FullName, body);`
	`410`	`+ Logger.Debug("Message send {QueueName} {Type} {%Message}", Name, queueMessage.MessageType.FullName, queueMessage.MessageBody);`
`411`	`411`
`412`	`412`	`if (!Transactional && numberOfChunks > 1)`
`413`	`413`	`throw new MessageSizeException(memoryStream.Length, buffer.Length, Transactional);`
`414`	`414`
`415`	`415`	`while ((bytes = memoryStream.Read(buffer, 0, buffer.Length)) > 0)`
`416`	`416`	`{`
`417`		`- var queueMessage = new Message`
	`417`	`+ var mqMessage = new Message`
`418`	`418`	`{`
`419`	`419`	`AppSpecific = numberOfChunks,`
`420`	`420`	`CorrelationId = correlationId`
`421`	`421`	`};`
`422`	`422`
`423`		`- queueMessage.BodyStream.Write(buffer, 0, bytes);`
	`423`	`+ mqMessage.BodyStream.Write(buffer, 0, bytes);`
`424`	`424`
`425`	`425`	`Logger.Debug("Sending message chunk ({Chunk}/{NumberOfChunks}) on {QueueName} {CorrelationId}", ++chunk, numberOfChunks, Name, correlationId);`
`426`	`426`
`427`		`- MessageQueueManager.Send(MessageQueue, queueMessage, messageQueueTransaction?.Transaction);`
	`427`	`+ MessageQueueManager.Send(MessageQueue, mqMessage, messageQueueTransaction?.Transaction);`
`428`	`428`
`429`		`- correlationId = queueMessage.Id;`
	`429`	`+ correlationId = mqMessage.Id;`
`430`	`430`	`}`
`431`	`431`	`}`
`432`	`432`	`}`