You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2018/03/26 14:32:47 UTC

[1/2] activemq-artemis git commit: [ARTEMIS-1761] Log one warning if cluster could not be formed because it's not possible to connect to other cluster node

Repository: activemq-artemis
Updated Branches:
  refs/heads/master acb134316 -> 5a3944656


[ARTEMIS-1761] Log one warning if cluster could not be formed because it's not possible to connect to other cluster node


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

Branch: refs/heads/master
Commit: 373c3db2ac4c3b79d4f777ee32498c924176eba6
Parents: acb1343
Author: Radovan STANCEL <rs...@redhat.com>
Authored: Wed Mar 21 18:26:20 2018 +0100
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Mar 26 10:32:17 2018 -0400

----------------------------------------------------------------------
 .../activemq/artemis/core/server/ActiveMQServerLogger.java       | 3 +++
 .../activemq/artemis/core/server/cluster/impl/BridgeImpl.java    | 4 +---
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/373c3db2/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
index 29c8f53..353403f 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
@@ -1927,4 +1927,7 @@ public interface ActiveMQServerLogger extends BasicLogger {
    @Message(id = 224090, value = "This node is not configured for Quorum Voting, all nodes must be configured for HA", format = Message.Format.MESSAGE_FORMAT)
    void noVoteHandlerConfigured();
 
+   @LogMessage(level = Logger.Level.WARN)
+   @Message(id = 224091, value = "Bridge {0} is unable to connect to destination. Retrying", format = Message.Format.MESSAGE_FORMAT)
+   void errorConnectingBridgeRetry(Bridge bridge);
 }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/373c3db2/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java
index a83e91b..9815d37 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java
@@ -929,9 +929,7 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
                scheduleRetryConnectFixedTimeout(this.retryInterval);
                return;
             } else {
-               if (logger.isDebugEnabled()) {
-                  logger.debug("Bridge " + this + " is unable to connect to destination. Retrying", e);
-               }
+               ActiveMQServerLogger.LOGGER.errorConnectingBridgeRetry(this);
 
                scheduleRetryConnect();
             }


[2/2] activemq-artemis git commit: This closes #1964

Posted by cl...@apache.org.
This closes #1964


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

Branch: refs/heads/master
Commit: 5a394465618829dd1cbecb0f7bb123bfe333f060
Parents: acb1343 373c3db
Author: Clebert Suconic <cl...@apache.org>
Authored: Mon Mar 26 10:32:53 2018 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Mar 26 10:32:53 2018 -0400

----------------------------------------------------------------------
 .../activemq/artemis/core/server/ActiveMQServerLogger.java       | 3 +++
 .../activemq/artemis/core/server/cluster/impl/BridgeImpl.java    | 4 +---
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------