QPID-1177 : Added Protocol Level Debug logging. Uses a final static so should JIT out if disabled. To enable set -Damqj.protocol.logging.level=info

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@676982 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 15 insertions, 1 deletions

diff --git a/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java b/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
index 8ac4f843de..c07e4d6c2e 100644
--- a/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
+++ b/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
@@ -122,6 +122,8 @@ public class AMQProtocolHandler extends IoHandlerAdapter
 {
     /** Used for debugging. */
     private static final Logger _logger = LoggerFactory.getLogger(AMQProtocolHandler.class);
+    private static final Logger _protocolLogger = LoggerFactory.getLogger("qpid.protocol");
+    private static final boolean PROTOCOL_DEBUG = (System.getProperty("amqj.protocol.logging.level") != null);
 
     /**
      * The connection that this protocol handler is associated with. There is a 1-1 mapping between connection
@@ -484,7 +486,12 @@ public class AMQProtocolHandler extends IoHandlerAdapter
 
     public void messageReceived(IoSession session, Object message) throws Exception
     {
-        if (message instanceof AMQFrame)
+        if (PROTOCOL_DEBUG)
+        {
+            _protocolLogger.info("Recv:"+message);
+        }
+
+        if(message instanceof AMQFrame)
         {
             final boolean debug = _logger.isDebugEnabled();
             final long msgNumber = ++_messageReceivedCount;
@@ -565,6 +572,11 @@ public class AMQProtocolHandler extends IoHandlerAdapter
 
     public void messageSent(IoSession session, Object message) throws Exception
     {
+        if (PROTOCOL_DEBUG)
+        {
+            _protocolLogger.info("Send:"+message);
+        }
+        
         final long sentMessages = _messagesOut++;
 
         final boolean debug = _logger.isDebugEnabled();
diff --git a/java/common/src/main/java/log4j.properties b/java/common/src/main/java/log4j.properties
index 6d596d1d19..3f9554c0b4 100644
--- a/java/common/src/main/java/log4j.properties
+++ b/java/common/src/main/java/log4j.properties
@@ -19,6 +19,8 @@
 log4j.rootLogger=${root.logging.level}
 
 
+log4j.logger.qpid.protocol=${amqj.protocol.logging.level}, console
+log4j.additivity.qpid.protocol=false
 log4j.logger.org.apache.qpid=${amqj.logging.level}, console
 log4j.additivity.org.apache.qpid=false