You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2015/08/31 23:21:25 UTC

svn commit: r1700356 - in /qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server: logging/messages/PortMessages.java logging/messages/Port_logmessages.properties transport/MultiVersionProtocolEngine.java

Author: kwall
Date: Mon Aug 31 21:21:25 2015
New Revision: 1700356

URL: http://svn.apache.org/r1700356
Log:
QPID-6271: [Java Broker] Log protocol downgrades / unrecognised initiations

Modified:
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Port_logmessages.properties
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngine.java

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java?rev=1700356&r1=1700355&r2=1700356&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java Mon Aug 31 21:21:25 2015
@@ -51,6 +51,7 @@ public class PortMessages
     public static final String CLOSE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "port.close";
     public static final String CONNECTION_REJECTED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "port.connection_rejected";
     public static final String CONNECTION_COUNT_WARN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "port.connection_count_warn";
+    public static final String UNSUPPORTED_PROTOCOL_HEADER_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "port.unsupported_protocol_header";
 
     static
     {
@@ -61,6 +62,7 @@ public class PortMessages
         LoggerFactory.getLogger(CLOSE_LOG_HIERARCHY);
         LoggerFactory.getLogger(CONNECTION_REJECTED_LOG_HIERARCHY);
         LoggerFactory.getLogger(CONNECTION_COUNT_WARN_LOG_HIERARCHY);
+        LoggerFactory.getLogger(UNSUPPORTED_PROTOCOL_HEADER_LOG_HIERARCHY);
 
         _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.Port_logmessages", _currentLocale);
     }
@@ -403,6 +405,63 @@ public class PortMessages
         };
     }
 
+    /**
+     * Log a Port message of the Format:
+     * <pre>PRT-1007 : Unsupported protocol header received, replying with {0}</pre>
+     * Optional values are contained in [square brackets] and are numbered
+     * sequentially in the method call.
+     *
+     */
+    public static LogMessage UNSUPPORTED_PROTOCOL_HEADER(String param1)
+    {
+        String rawMessage = _messages.getString("UNSUPPORTED_PROTOCOL_HEADER");
+
+        final Object[] messageArguments = {param1};
+        // Create a new MessageFormat to ensure thread safety.
+        // Sharing a MessageFormat and using applyPattern is not thread safe
+        MessageFormat formatter = new MessageFormat(rawMessage, _currentLocale);
+
+        final String message = formatter.format(messageArguments);
+
+        return new LogMessage()
+        {
+            public String toString()
+            {
+                return message;
+            }
+
+            public String getLogHierarchy()
+            {
+                return UNSUPPORTED_PROTOCOL_HEADER_LOG_HIERARCHY;
+            }
+
+            @Override
+            public boolean equals(final Object o)
+            {
+                if (this == o)
+                {
+                    return true;
+                }
+                if (o == null || getClass() != o.getClass())
+                {
+                    return false;
+                }
+
+                final LogMessage that = (LogMessage) o;
+
+                return getLogHierarchy().equals(that.getLogHierarchy()) && toString().equals(that.toString());
+
+            }
+
+            @Override
+            public int hashCode()
+            {
+                int result = toString().hashCode();
+                result = 31 * result + getLogHierarchy().hashCode();
+                return result;
+            }
+        };
+    }
 
     private PortMessages()
     {

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Port_logmessages.properties
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Port_logmessages.properties?rev=1700356&r1=1700355&r2=1700356&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Port_logmessages.properties (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Port_logmessages.properties Mon Aug 31 21:21:25 2015
@@ -27,3 +27,4 @@ CONNECTION_REJECTED = PRT-1005 : Connect
 
 DELETE = PRT-1006 : Delete {0} Port "{1}"
 
+UNSUPPORTED_PROTOCOL_HEADER = PRT-1007 : Unsupported protocol header received, replying with {0}

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngine.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngine.java?rev=1700356&r1=1700355&r2=1700356&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngine.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngine.java Mon Aug 31 21:21:25 2015
@@ -35,6 +35,8 @@ import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.bytebuffer.QpidByteBuffer;
 import org.apache.qpid.server.logging.messages.ConnectionMessages;
+import org.apache.qpid.server.logging.messages.PortMessages;
+import org.apache.qpid.server.logging.subjects.PortLogSubject;
 import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.model.Protocol;
 import org.apache.qpid.server.model.Transport;
@@ -50,6 +52,8 @@ public class MultiVersionProtocolEngine
 {
     private static final Logger _logger = LoggerFactory.getLogger(MultiVersionProtocolEngine.class);
 
+    private static final int MINIMUM_REQUIRED_HEADER_BYTES = 8;
+
     private final long _id;
     private final AmqpPort<?> _port;
     private Transport _transport;
@@ -160,8 +164,6 @@ public class MultiVersionProtocolEngine
         _delegate.setTransportBlockedForWriting(blocked);
     }
 
-    private static final int MINIMUM_REQUIRED_HEADER_BYTES = 8;
-
     public void setNetworkConnection(NetworkConnection network)
     {
         _network = network;
@@ -271,22 +273,26 @@ public class MultiVersionProtocolEngine
 
         }
 
+        @Override
         public void received(QpidByteBuffer msg)
         {
-            _logger.error("Error processing incoming data, could not negotiate a common protocol");
+            _logger.debug("Error processing incoming data, could not negotiate a common protocol");
             msg.position(msg.limit());
         }
 
+        @Override
         public void closed()
         {
 
         }
 
+        @Override
         public void writerIdle()
         {
 
         }
 
+        @Override
         public void readerIdle()
         {
 
@@ -388,6 +394,7 @@ public class MultiVersionProtocolEngine
             _hasWork.set(false);
         }
 
+        @Override
         public void received(QpidByteBuffer msg)
         {
             _lastReadTime = System.currentTimeMillis();
@@ -461,19 +468,16 @@ public class MultiVersionProtocolEngine
                     //if a default reply was specified use its reply header instead of the most recent supported version
                     if(_defaultSupportedReply != null && !(_defaultSupportedReply == supportedReplyVersion))
                     {
-                        if(_logger.isDebugEnabled())
-                        {
-                            _logger.debug("Default reply to unsupported protocol version was configured, changing reply from "
-                                    + supportedReplyVersion + " to " + _defaultSupportedReply);
-                        }
+                        _logger.debug("Default reply to unsupported protocol version was configured, changing reply from {} to {}",
+                                      supportedReplyVersion, _defaultSupportedReply);
 
                         supportedReplyBytes = defaultSupportedReplyBytes;
                         supportedReplyVersion = _defaultSupportedReply;
                     }
-                    if(_logger.isDebugEnabled())
-                    {
-                        _logger.debug("Unsupported protocol version requested, replying with: " + supportedReplyVersion);
-                    }
+
+                    _broker.getEventLogger().message(new PortLogSubject(_port),
+                                                     PortMessages.UNSUPPORTED_PROTOCOL_HEADER(supportedReplyVersion.toString()));
+
                     final QpidByteBuffer supportedReplyBuf = QpidByteBuffer.allocateDirect(supportedReplyBytes.length);
                     supportedReplyBuf.put(supportedReplyBytes);
                     supportedReplyBuf.flip();
@@ -534,15 +538,14 @@ public class MultiVersionProtocolEngine
         {
         }
 
+        @Override
         public void closed()
         {
             try
             {
                 _delegate = new ClosedDelegateProtocolEngine();
-                if(_logger.isDebugEnabled())
-                {
-                    _logger.debug("Connection from  " + _network.getRemoteAddress() + " was closed before any protocol version was established.");
-                }
+                _logger.debug("Connection from {} was closed before any protocol version was established.",
+                              _network.getRemoteAddress());
             }
             catch(Exception e)
             {
@@ -561,11 +564,13 @@ public class MultiVersionProtocolEngine
             }
         }
 
+        @Override
         public void writerIdle()
         {
 
         }
 
+        @Override
         public void readerIdle()
         {
             _broker.getEventLogger().message(ConnectionMessages.IDLE_CLOSE());



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org