activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject activemq git commit: https://issues.apache.org/jira/browse/AMQ-6127
Date Tue, 12 Apr 2016 20:28:32 GMT
Repository: activemq
Updated Branches:
  refs/heads/master 332a8225f -> f9682b802


https://issues.apache.org/jira/browse/AMQ-6127

LOG at info level for when broker is being stopped and a new connection
is not being accepted.  

Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/f9682b80
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/f9682b80
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/f9682b80

Branch: refs/heads/master
Commit: f9682b802f848b91b6a12aa6c99cec028b552997
Parents: 332a822
Author: Timothy Bish <tabish121@gmail.com>
Authored: Tue Apr 12 16:28:23 2016 -0400
Committer: Timothy Bish <tabish121@gmail.com>
Committed: Tue Apr 12 16:28:23 2016 -0400

----------------------------------------------------------------------
 .../org/apache/activemq/broker/TransportConnector.java    | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/f9682b80/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnector.java
----------------------------------------------------------------------
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnector.java
b/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnector.java
index 5e9c645..ac96619 100755
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnector.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnector.java
@@ -239,9 +239,12 @@ public class TransportConnector implements Connector, BrokerServiceAware
{
             }
 
             private void onAcceptError(Exception error, String remoteHost) {
-                LOG.error("Could not accept connection " + (remoteHost == null ? "" : "from
" + remoteHost) + ": "
-                        + error);
-                LOG.debug("Reason: " + error, error);
+                if (brokerService != null && brokerService.isStopping()) {
+                    LOG.info("Could not accept connection during shutdown {} : {}", (remoteHost
== null ? "" : "from " + remoteHost), error);
+                } else {
+                    LOG.error("Could not accept connection {} : {}", (remoteHost == null
? "" : "from " + remoteHost), error);
+                    LOG.debug("Reason: " + error, error);
+                }
             }
         });
         getServer().setBrokerInfo(brokerInfo);
@@ -560,6 +563,7 @@ public class TransportConnector implements Connector, BrokerServiceAware
{
     /**
      * @return the updateClusterFilter
      */
+    @Override
     public String getUpdateClusterFilter() {
         return this.updateClusterFilter;
     }


Mime
View raw message