From 4f3f5b6fb45b3f2f150c8534bc87e50b56ed71ee Mon Sep 17 00:00:00 2001 From: Alex Rudyy Date: Fri, 5 Dec 2014 09:33:27 +0000 Subject: QPID-6257: Introduce operational log for connection being dropped by the clients or due to network issue and change the log level for SenderExceptions into INFO/DEBUG git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1643208 13f79535-47bb-0310-9956-ffa450edef68 --- .../logging/messages/ConnectionMessages.java | 29 ++++++++ .../messages/Connection_logmessages.properties | 1 + .../server/protocol/v0_10/ServerConnection.java | 2 +- .../server/protocol/v0_8/AMQProtocolEngine.java | 85 ++++++++++++++-------- .../protocol/v0_8/InternalTestProtocolSession.java | 2 +- .../qpid/server/protocol/v0_8/MaxChannelsTest.java | 2 +- .../java/org/apache/qpid/transport/Connection.java | 5 ++ 7 files changed, 91 insertions(+), 35 deletions(-) (limited to 'qpid/java') diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java index ad44dc1d97..42c41849ab 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java @@ -45,6 +45,7 @@ public class ConnectionMessages public static final String CONNECTION_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "connection"; public static final String OPEN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "connection.open"; + public static final String DROPPED_CONNECTION_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "connection.dropped_connection"; public static final String IDLE_CLOSE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "connection.idle_close"; public static final String CLOSE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "connection.close"; @@ -52,6 +53,7 @@ public class ConnectionMessages { Logger.getLogger(CONNECTION_LOG_HIERARCHY); Logger.getLogger(OPEN_LOG_HIERARCHY); + Logger.getLogger(DROPPED_CONNECTION_LOG_HIERARCHY); Logger.getLogger(IDLE_CLOSE_LOG_HIERARCHY); Logger.getLogger(CLOSE_LOG_HIERARCHY); @@ -143,6 +145,33 @@ public class ConnectionMessages }; } + /** + * Log a Connection message of the Format: + * 
CON-1004 : Connection dropped
+ * Optional values are contained in [square brackets] and are numbered + * sequentially in the method call. + * + */ + public static LogMessage DROPPED_CONNECTION() + { + String rawMessage = _messages.getString("DROPPED_CONNECTION"); + + final String message = rawMessage; + + return new LogMessage() + { + public String toString() + { + return message; + } + + public String getLogHierarchy() + { + return DROPPED_CONNECTION_LOG_HIERARCHY; + } + }; + } + /** * Log a Connection message of the Format: * 
CON-1003 : Closed due to inactivity
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Connection_logmessages.properties b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Connection_logmessages.properties index ad9896a659..6b6f5c10bb 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Connection_logmessages.properties +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Connection_logmessages.properties @@ -24,3 +24,4 @@ OPEN = CON-1001 : Open[ : Client ID : {0}][ : Protocol Version : {1}][ : Client Version : {2}][ : Client Product : {3}] CLOSE = CON-1002 : Close IDLE_CLOSE = CON-1003 : Closed due to inactivity +DROPPED_CONNECTION = CON-1004 : Connection dropped \ No newline at end of file diff --git a/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java index bc463ef59e..8567be37f0 100644 --- a/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java +++ b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java @@ -174,7 +174,7 @@ public class ServerConnection extends Connection implements AMQConnectionModel task : _taskList) - { - task.performAction(this); - } - - synchronized (this) - { - _closed = true; - notifyAll(); - } - getEventLogger().message(_logSubject, ConnectionMessages.CLOSE()); - } - } } else { @@ -823,7 +809,7 @@ public class AMQProtocolEngine implements ServerProtocolEngine, @Override public Object run() { - closeSession(); + closeSession(connectionDropped); return null; } }); @@ -831,6 +817,41 @@ public class AMQProtocolEngine implements ServerProtocolEngine, } } + private void finishClose(boolean connectionDropped) + { + if (!_closed) + { + + try + { + if (_virtualHost != null) + { + _virtualHost.getConnectionRegistry().deregisterConnection(this); + } + closeAllChannels(); + } + finally + { + try + { + for (Action task : _taskList) + { + task.performAction(this); + } + } + finally + { + synchronized (this) + { + _closed = true; + notifyAll(); + } + getEventLogger().message(_logSubject, connectionDropped ? ConnectionMessages.DROPPED_CONNECTION() : ConnectionMessages.CLOSE()); + } + } + } + } + private void awaitClosed() { synchronized(this) @@ -898,7 +919,7 @@ public class AMQProtocolEngine implements ServerProtocolEngine, try { markChannelAwaitingCloseOk(channelId); - closeSession(); + closeSession(false); } finally { @@ -1126,7 +1147,7 @@ public class AMQProtocolEngine implements ServerProtocolEngine, { try { - closeSession(); + closeSession(true); } finally { @@ -1561,7 +1582,7 @@ public class AMQProtocolEngine implements ServerProtocolEngine, } try { - closeSession(); + closeSession(false); } catch (Exception e) { @@ -1588,7 +1609,7 @@ public class AMQProtocolEngine implements ServerProtocolEngine, try { - closeSession(); + closeSession(false); } catch (Exception e) { diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java index c01a349509..7407890b58 100644 --- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java +++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java @@ -231,7 +231,7 @@ public class InternalTestProtocolSession extends AMQProtocolEngine implements Pr //Simulate the Client responding with a CloseOK // should really update the StateManger but we don't have access here // changeState(AMQState.CONNECTION_CLOSED); - ((AMQChannel)session).getConnection().closeSession(); + ((AMQChannel)session).getConnection().closeSession(false); } diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MaxChannelsTest.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MaxChannelsTest.java index 107e64bee5..c6f7defe56 100644 --- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MaxChannelsTest.java +++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MaxChannelsTest.java @@ -62,7 +62,7 @@ public class MaxChannelsTest extends QpidTestCase try { _session.getVirtualHost().close(); - _session.closeSession(); + _session.closeSession(false); } finally { diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java index b79a2c13fd..e33e007f6e 100644 --- a/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java +++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java @@ -730,6 +730,11 @@ public class Connection extends ConnectionInvoker return connectionLost.get(); } + protected boolean isConnectionLost() + { + return connectionLost.get(); + } + protected Collection getChannels() { return new ArrayList<>(channels.values()); -- cgit v1.2.1