You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2018/12/12 17:03:49 UTC
qpid-jms git commit: QPIDJMS-439: distinguish sessions and
connections better in the protocol trace logs
Repository: qpid-jms
Updated Branches:
refs/heads/master 0633a2330 -> 2da24883d
QPIDJMS-439: distinguish sessions and connections better in the protocol trace logs
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/2da24883
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/2da24883
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/2da24883
Branch: refs/heads/master
Commit: 2da24883dfddf0440c8358716148eb6e320e2dd7
Parents: 0633a23
Author: Robbie Gemmell <ro...@apache.org>
Authored: Wed Dec 12 17:03:06 2018 +0000
Committer: Robbie Gemmell <ro...@apache.org>
Committed: Wed Dec 12 17:03:06 2018 +0000
----------------------------------------------------------------------
.../qpid/jms/provider/amqp/AmqpProtocolTracer.java | 12 +++++++-----
.../org/apache/qpid/jms/provider/amqp/AmqpProvider.java | 2 +-
2 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/2da24883/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProtocolTracer.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProtocolTracer.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProtocolTracer.java
index 2751a1b..98cd1b2 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProtocolTracer.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProtocolTracer.java
@@ -30,25 +30,27 @@ public class AmqpProtocolTracer implements ProtocolTracer {
public static final int DEFAULT_PAYLOAD_STRING_LIMIT = 1024;
private final Logger logger;
+ private final int transportIdentifier;
private final int payloadStringLimit;
- public AmqpProtocolTracer(Logger logger) {
- this(logger, DEFAULT_PAYLOAD_STRING_LIMIT);
+ public AmqpProtocolTracer(Logger logger, int transportIdentifier) {
+ this(logger, transportIdentifier, DEFAULT_PAYLOAD_STRING_LIMIT);
}
- public AmqpProtocolTracer(Logger logger, int payloadStringLimit) {
+ public AmqpProtocolTracer(Logger logger, int transportIdentifier, int payloadStringLimit) {
this.logger = logger;
this.payloadStringLimit = payloadStringLimit;
+ this.transportIdentifier = transportIdentifier;
}
@Override
public void receivedFrame(TransportFrame transportFrame) {
- logger.trace("RECV: {}{}", transportFrame.getBody(), formatPayload(transportFrame));
+ logger.trace("[{}:{}] RECV: {}{}", transportIdentifier, transportFrame.getChannel(), transportFrame.getBody(), formatPayload(transportFrame));
}
@Override
public void sentFrame(TransportFrame transportFrame) {
- logger.trace("SENT: {}{}", transportFrame.getBody(), formatPayload(transportFrame));
+ logger.trace("[{}:{}] SENT: {}{}", transportIdentifier, transportFrame.getChannel(), transportFrame.getBody(), formatPayload(transportFrame));
}
private String formatPayload(TransportFrame frame) {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/2da24883/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java
index dbdc977..f5d1ab4 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java
@@ -785,7 +785,7 @@ public class AmqpProvider implements Provider, TransportListener , AmqpResourceP
private void updateTracer() {
if (isTraceFrames()) {
- ((TransportImpl) protonTransport).setProtocolTracer(new AmqpProtocolTracer(TRACE_FRAMES, traceFramesPayloadLimit));
+ ((TransportImpl) protonTransport).setProtocolTracer(new AmqpProtocolTracer(TRACE_FRAMES, System.identityHashCode(protonTransport), traceFramesPayloadLimit));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org