From 58f37a88b1cf6e6a3fa27d184238885a875cbb9f Mon Sep 17 00:00:00 2001 From: Kim van der Riet Date: Thu, 25 Jan 2007 21:00:22 +0000 Subject: Added mechanism to track connection ids for logging and debugging purposes. Changed format of log/debug messages for RequestManager and ResponseManager. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/qpid.0-9@499968 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/qpid/framing/RequestManager.java | 20 +++++++++++--------- .../org/apache/qpid/framing/ResponseManager.java | 20 +++++++++++--------- 2 files changed, 22 insertions(+), 18 deletions(-) (limited to 'java/common/src') diff --git a/java/common/src/main/java/org/apache/qpid/framing/RequestManager.java b/java/common/src/main/java/org/apache/qpid/framing/RequestManager.java index f7178742f9..cd63a60c04 100644 --- a/java/common/src/main/java/org/apache/qpid/framing/RequestManager.java +++ b/java/common/src/main/java/org/apache/qpid/framing/RequestManager.java @@ -40,6 +40,7 @@ public class RequestManager * to be known. */ private boolean serverFlag; + private int connectionId; /** * Request and response frames must have a requestID and responseID which @@ -55,11 +56,12 @@ public class RequestManager private ConcurrentHashMap requestSentMap; - public RequestManager(int channel, AMQProtocolWriter protocolWriter, boolean serverFlag) + public RequestManager(int connectionId, int channel, AMQProtocolWriter protocolWriter, boolean serverFlag) { this.channel = channel; this.protocolWriter = protocolWriter; this.serverFlag = serverFlag; + this.connectionId = connectionId; requestIdCount = 1L; lastProcessedResponseId = 0L; requestSentMap = new ConcurrentHashMap(); @@ -77,11 +79,11 @@ public class RequestManager protocolWriter.writeFrame(requestFrame); if (logger.isDebugEnabled()) { - logger.debug((serverFlag ? "SRV" : "CLI") + " TX REQ: ch=" + channel + - " Req[" + requestId + " " + lastProcessedResponseId + "]; " + requestMethodBody); + logger.debug((serverFlag ? "SRV[" : "CLI[") + connectionId + "," + channel + + "] TX REQ: Req[" + requestId + " " + lastProcessedResponseId + "]; " + requestMethodBody); } - //System.out.println((serverFlag ? "SRV" : "CLI") + " TX REQ: ch=" + channel + - // " Req[" + requestId + " " + lastProcessedResponseId + "]; " + requestMethodBody); + //System.out.println((serverFlag ? "SRV[" : "CLI[") + connectionId + "," + channel + + // "] TX REQ: Req[" + requestId + " " + lastProcessedResponseId + "]; " + requestMethodBody); return requestId; } @@ -92,11 +94,11 @@ public class RequestManager long requestIdStop = requestIdStart + responseBody.getBatchOffset(); if (logger.isDebugEnabled()) { - logger.debug((serverFlag ? "SRV" : "CLI") + " RX RES: ch=" + channel + - " " + responseBody + "; " + responseBody.getMethodPayload()); + logger.debug((serverFlag ? "SRV[" : "CLI[") + connectionId + "," + channel + "] RX RES: " + + responseBody + "; " + responseBody.getMethodPayload()); } - //System.out.println((serverFlag ? "SRV" : "CLI") + " RX RES: ch=" + channel + - // " " + responseBody + "; " + responseBody.getMethodPayload()); + //System.out.println((serverFlag ? "SRV[" : "CLI[") + connectionId + "," + channel + "] RX RES: " + + // responseBody + "; " + responseBody.getMethodPayload()); for (long requestId = requestIdStart; requestId <= requestIdStop; requestId++) { AMQMethodListener methodListener = requestSentMap.get(requestId); diff --git a/java/common/src/main/java/org/apache/qpid/framing/ResponseManager.java b/java/common/src/main/java/org/apache/qpid/framing/ResponseManager.java index dc7a0a2b75..3148603d65 100644 --- a/java/common/src/main/java/org/apache/qpid/framing/ResponseManager.java +++ b/java/common/src/main/java/org/apache/qpid/framing/ResponseManager.java @@ -43,6 +43,7 @@ public class ResponseManager * to be known. */ private boolean serverFlag; + private int connectionId; private int maxAccumulatedResponses = 20; // Default // private Class currentResponseMethodBodyClass; @@ -83,13 +84,14 @@ public class ResponseManager private ConcurrentHashMap responseMap; - public ResponseManager(int channel, AMQMethodListener methodListener, + public ResponseManager(int connectionId, int channel, AMQMethodListener methodListener, AMQProtocolWriter protocolWriter, boolean serverFlag) { this.channel = channel; this.methodListener = methodListener; this.protocolWriter = protocolWriter; this.serverFlag = serverFlag; + this.connectionId = connectionId; responseIdCount = 1L; lastReceivedRequestId = 0L; // currentResponseMethodBodyClass = null; @@ -103,11 +105,11 @@ public class ResponseManager long requestId = requestBody.getRequestId(); if (logger.isDebugEnabled()) { - logger.debug((serverFlag ? "SRV" : "CLI") + " RX REQ: ch=" + channel + - " " + requestBody + "; " + requestBody.getMethodPayload()); + logger.debug((serverFlag ? "SRV[" : "CLI[") + connectionId + "," + channel + "] RX REQ: " + + requestBody + "; " + requestBody.getMethodPayload()); } - //System.out.println((serverFlag ? "SRV" : "CLI") + " RX REQ: ch=" + channel + - // " " + requestBody + "; " + requestBody.getMethodPayload()); + //System.out.println((serverFlag ? "SRV[" : "CLI[") + connectionId + "," + channel + "] RX REQ: " + + // requestBody + "; " + requestBody.getMethodPayload()); // TODO: responseMark is used in HA, but until then, ignore... long responseMark = requestBody.getResponseMark(); lastReceivedRequestId = requestId; @@ -122,11 +124,11 @@ public class ResponseManager { if (logger.isDebugEnabled()) { - logger.debug((serverFlag ? "SRV" : "CLI") + " TX RES: ch=" + channel + - " Res[# " + requestId + "]; " + responseMethodBody); + logger.debug((serverFlag ? "SRV[" : "CLI[") + connectionId + "," + channel + + "] TX RES: Res[# " + requestId + "]; " + responseMethodBody); } - //System.out.println((serverFlag ? "SRV" : "CLI") + " TX RES: ch=" + channel + - // " Res[# " + requestId + "]; " + responseMethodBody); + //System.out.println((serverFlag ? "SRV[" : "CLI[") + connectionId + "," + channel + + // "] TX RES: Res[# " + requestId + "]; " + responseMethodBody); ResponseStatus responseStatus = responseMap.get(requestId); if (responseStatus == null) throw new RequestResponseMappingException(requestId, -- cgit v1.2.1