QPIDJMS-122 Add support for a test to enable proton-j frame tracing. Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/4cb77adb Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/4cb77adb Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/4cb77adb
Branch: refs/heads/master Commit: 4cb77adbd350dde8752190eb317b4146aabe3e48 Parents: 6fd54e0 Author: Timothy Bish <tabish...@gmail.com> Authored: Fri Oct 9 16:14:30 2015 -0400 Committer: Timothy Bish <tabish...@gmail.com> Committed: Fri Oct 9 16:14:30 2015 -0400 ---------------------------------------------------------------------- .../org/apache/qpid/jms/support/AmqpTestSupport.java | 14 +++++++++++--- .../src/test/resources/log4j.properties | 2 ++ 2 files changed, 13 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/4cb77adb/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/AmqpTestSupport.java ---------------------------------------------------------------------- diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/AmqpTestSupport.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/AmqpTestSupport.java index 7b2cf72..9af74f4 100644 --- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/AmqpTestSupport.java +++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/AmqpTestSupport.java @@ -57,6 +57,10 @@ public class AmqpTestSupport extends QpidJmsTestSupport { return false; } + protected boolean isFrameTracingEnabled() { + return false; + } + @Override public URI getBrokerActiveMQClientConnectionURI() { if (isAddOpenWireConnector()) { @@ -77,8 +81,10 @@ public class AmqpTestSupport extends QpidJmsTestSupport { port = portMap.get("amqp"); } TransportConnector connector = brokerService.addConnector( - "amqp://0.0.0.0:" + port + "?transport.transformer=" + getAmqpTransformer() + - "&transport.socketBufferSize=" + getSocketBufferSize() + "&ioBufferSize=" + getIOBufferSize()); + "amqp://0.0.0.0:" + port + + "?transport.transformer=" + getAmqpTransformer() + + "&transport.socketBufferSize=" + getSocketBufferSize() + + "&ioBufferSize=" + getIOBufferSize()); connector.setName("amqp"); if (isAmqpDiscovery()) { String uriString = "multicast://default"; @@ -114,7 +120,9 @@ public class AmqpTestSupport extends QpidJmsTestSupport { brokerService.getTransportConnectorByName("amqp").getPublishableConnectURI().getPort(); if (!getAmqpConnectionURIOptions().isEmpty()) { - uri = uri + "?" + getAmqpConnectionURIOptions(); + uri = uri + "?amqp.traceFrames=" + isFrameTracingEnabled() + "&" + getAmqpConnectionURIOptions(); + } else { + uri = uri + "?amqp.traceFrames=" + isFrameTracingEnabled(); } return new URI(uri); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/4cb77adb/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/log4j.properties b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/log4j.properties index ce9b95c..9930c03 100644 --- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/log4j.properties +++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/log4j.properties @@ -22,6 +22,8 @@ log4j.rootLogger=INFO, out, stdout log4j.logger.org.apache.qpid.jms=INFO log4j.logger.org.apache.qpid.jms.provider=INFO +log4j.logger.org.apache.qpid.jms.provider.amqp=INFO +log4j.logger.org.apache.qpid.jms.provider.amqp.FRAMES=INFO # Tune the ActiveMQ and it's AMQP transport as needed for debugging. log4j.logger.org.apache.activemq=INFO --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org