diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2010-02-05 10:13:21 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2010-02-05 10:13:21 +0000 |
| commit | 9a2820488699edbf64cd48d5ce69700a0963d925 (patch) | |
| tree | d6f1c85102c5cbfe04e63229d2ef03cec714d881 /qpid/java/broker | |
| parent | 5428564d2440189b9d978c3f8467872cc0802252 (diff) | |
| download | qpid-python-9a2820488699edbf64cd48d5ce69700a0963d925.tar.gz | |
QPID-2370 : Committing patch to improve broker logging. This will not cleanly apply to trunk due to IO changes.
QPID-1084 : Committed change to prevent flow control threads being created/sent if the channel/session is closed or the state has acutally changed in the mean time.
Wrapped .debug statements as per review feedback
Merged and adapted these changes from 0.5.x r905592,905596,905605
The AMQMinaProtocolSession Changes were moved to the AMQProtocolEngine
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@906890 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker')
| -rw-r--r-- | qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java | 4 | ||||
| -rw-r--r-- | qpid/java/broker/src/main/java/org/apache/qpid/server/state/AMQStateManager.java | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java index ec74f79ace..6d2826b55e 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java @@ -407,11 +407,13 @@ public class AMQProtocolEngine implements ProtocolEngine, Managable, AMQProtocol evt.getMethod().getConnectionException(AMQConstant.CHANNEL_ERROR, AMQConstant.CHANNEL_ERROR.getName().toString()); + _logger.info(e.getMessage() + " whilst processing:" + methodBody); closeConnection(channelId, ce, false); } } catch (AMQConnectionException e) { + _logger.info(e.getMessage() + " whilst processing:" + methodBody); closeConnection(channelId, e, false); } } @@ -744,7 +746,7 @@ public class AMQProtocolEngine implements ProtocolEngine, Managable, AMQProtocol { if (_logger.isInfoEnabled()) { - _logger.info("Closing connection due to: " + e.getMessage()); + _logger.info("Closing connection due to: " + e); } markChannelAwaitingCloseOk(channelId); diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/state/AMQStateManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/state/AMQStateManager.java index c5b3099f58..6850724b10 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/state/AMQStateManager.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/state/AMQStateManager.java @@ -196,7 +196,7 @@ public class AMQStateManager implements AMQMethodListener || (body instanceof ChannelCloseOkBody) || (body instanceof ChannelCloseBody))) { - throw body.getConnectionException(AMQConstant.CHANNEL_ERROR, "channel is closed"); + throw body.getConnectionException(AMQConstant.CHANNEL_ERROR, "channel is closed won't process:" + body); } } |