From c06ea3b4370d27973912410198d62f1df99c1e63 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@gopivotal.com>
Date: Thu, 26 Sep 2013 21:26:06 -0400
Subject: [PATCH] Polish logging

---
 .../messaging/simp/handler/AbstractBrokerMessageHandler.java    | 2 +-
 .../messaging/simp/stomp/StompBrokerRelayMessageHandler.java    | 2 +-
 spring-messaging/src/test/resources/log4j.xml                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/handler/AbstractBrokerMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/handler/AbstractBrokerMessageHandler.java
index 12cdf885c1..1a78e4113f 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/simp/handler/AbstractBrokerMessageHandler.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/handler/AbstractBrokerMessageHandler.java
@@ -141,7 +141,7 @@ public abstract class AbstractBrokerMessageHandler
 		}
 
 		if (logger.isTraceEnabled()) {
-			logger.trace("Message " + message);
+			logger.trace("Handling message " + message);
 		}
 
 		handleMessageInternal(message);
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.java
index beaef08453..6d22cffd84 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.java
@@ -305,7 +305,7 @@ public class StompBrokerRelayMessageHandler extends AbstractBrokerMessageHandler
 
 		private void readStompFrame(Message<byte[]> message) {
 			if (logger.isTraceEnabled()) {
-				logger.trace("Reading message " + message);
+				logger.trace("Reading message for sessionId=" + sessionId + ", " + message);
 			}
 
 			StompHeaderAccessor headers = StompHeaderAccessor.wrap(message);
diff --git a/spring-messaging/src/test/resources/log4j.xml b/spring-messaging/src/test/resources/log4j.xml
index 21f88afcfb..dfcc949166 100644
--- a/spring-messaging/src/test/resources/log4j.xml
+++ b/spring-messaging/src/test/resources/log4j.xml
@@ -7,7 +7,7 @@
 	<appender name="console" class="org.apache.log4j.ConsoleAppender">
 		<param name="Target" value="System.out" />
 		<layout class="org.apache.log4j.PatternLayout">
-			<param name="ConversionPattern" value="%-5p: %c - %m%n" />
+			<param name="ConversionPattern" value="%d{HH:mm:ss} [%t] %c{1} - %m%n" />
 		</layout>
 	</appender>