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 2018/03/30 13:11:20 UTC
[2/2] qpid-broker-j git commit: QPID-8147: [Broker-J] Report received
bytes as part of operational log message for unsupported protocol header
QPID-8147: [Broker-J] Report received bytes as part of operational log message for unsupported protocol header
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/912ac84d
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/912ac84d
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/912ac84d
Branch: refs/heads/7.0.x
Commit: 912ac84dcf0bc3df877b45e626242becb25d00cb
Parents: 62bb198
Author: Alex Rudyy <or...@apache.org>
Authored: Fri Mar 30 13:02:11 2018 +0100
Committer: Keith Wall <kw...@apache.org>
Committed: Fri Mar 30 14:11:14 2018 +0100
----------------------------------------------------------------------
.../org/apache/qpid/server/logging/messages/PortMessages.java | 6 +++---
.../qpid/server/logging/messages/Port_logmessages.properties | 2 +-
.../qpid/server/transport/MultiVersionProtocolEngine.java | 4 +++-
.../org/apache/qpid/server/logging/GenerateLogMessages.java | 5 ++---
4 files changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/912ac84d/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java
index c331c8f..a3add21 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java
@@ -623,16 +623,16 @@ public class PortMessages
/**
* Log a Port message of the Format:
- * <pre>PRT-1007 : Unsupported protocol header received, replying with {0}</pre>
+ * <pre>PRT-1007 : Unsupported protocol header received {0}, replying with {1}</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage UNSUPPORTED_PROTOCOL_HEADER(String param1)
+ public static LogMessage UNSUPPORTED_PROTOCOL_HEADER(String param1, String param2)
{
String rawMessage = _messages.getString("UNSUPPORTED_PROTOCOL_HEADER");
- final Object[] messageArguments = {param1};
+ final Object[] messageArguments = {param1, param2};
// Create a new MessageFormat to ensure thread safety.
// Sharing a MessageFormat and using applyPattern is not thread safe
MessageFormat formatter = new MessageFormat(rawMessage, _currentLocale);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/912ac84d/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Port_logmessages.properties
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Port_logmessages.properties b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Port_logmessages.properties
index 6d338a7..043721f 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Port_logmessages.properties
+++ b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Port_logmessages.properties
@@ -26,7 +26,7 @@ CONNECTION_REJECTED_TOO_MANY = PRT-1005 : Connection from {0} rejected. Maximum
DELETE = PRT-1006 : Delete {0} Port "{1}"
-UNSUPPORTED_PROTOCOL_HEADER = PRT-1007 : Unsupported protocol header received, replying with {0}
+UNSUPPORTED_PROTOCOL_HEADER = PRT-1007 : Unsupported protocol header received {0}, replying with {1}
CONNECTION_REJECTED_CLOSED = PRT-1008 : Connection from {0} rejected. Port closed.
BIND_FAILED = PRT-1009 : FAILED to bind {0} service to {1,number,#} - port in use
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/912ac84d/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngine.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngine.java b/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngine.java
index 2533777..56a0fa6 100755
--- a/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngine.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngine.java
@@ -46,6 +46,7 @@ import org.apache.qpid.server.model.port.AmqpPort;
import org.apache.qpid.server.plugin.ProtocolEngineCreator;
import org.apache.qpid.server.security.ManagedPeerCertificateTrustStore;
import org.apache.qpid.server.transport.network.Ticker;
+import org.apache.qpid.server.transport.util.Functions;
import org.apache.qpid.server.util.Action;
public class MultiVersionProtocolEngine implements ProtocolEngine
@@ -462,7 +463,8 @@ public class MultiVersionProtocolEngine implements ProtocolEngine
}
_broker.getEventLogger().message(new PortLogSubject(_port),
- PortMessages.UNSUPPORTED_PROTOCOL_HEADER(supportedReplyVersion.toString()));
+ PortMessages.UNSUPPORTED_PROTOCOL_HEADER(Functions.str(headerBytes),
+ supportedReplyVersion.toString()));
try (QpidByteBuffer supportedReplyBuf = QpidByteBuffer.allocateDirect(supportedReplyBytes.length))
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/912ac84d/broker-core/src/velocity/java/org/apache/qpid/server/logging/GenerateLogMessages.java
----------------------------------------------------------------------
diff --git a/broker-core/src/velocity/java/org/apache/qpid/server/logging/GenerateLogMessages.java b/broker-core/src/velocity/java/org/apache/qpid/server/logging/GenerateLogMessages.java
index 3df084c..ad0f6e9 100644
--- a/broker-core/src/velocity/java/org/apache/qpid/server/logging/GenerateLogMessages.java
+++ b/broker-core/src/velocity/java/org/apache/qpid/server/logging/GenerateLogMessages.java
@@ -468,12 +468,12 @@ public class GenerateLogMessages
*/
int typeIndex = parametersString[index].indexOf(",");
-
+ int typeIndexEnd = parametersString[index].indexOf("}", typeIndex);
// The parameter type
String type;
//Be default all types are Strings
- if (typeIndex == -1)
+ if (typeIndex == -1 || typeIndexEnd == -1)
{
type = "String";
}
@@ -483,7 +483,6 @@ public class GenerateLogMessages
// to identify this parameter as an integer
// This allows for a style value to be present
// Only check the text inside the braces '{}'
- int typeIndexEnd = parametersString[index].indexOf("}", typeIndex);
String typeString = parametersString[index].substring(typeIndex, typeIndexEnd);
if (typeString.contains("number") || typeString.contains("choice"))
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org