You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ma...@apache.org on 2016/04/08 14:17:13 UTC

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

Repository: activemq-artemis
Updated Branches:
  refs/heads/master c4a092c1c -> 2f0ecb306


This closes #442


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

Branch: refs/heads/master
Commit: 2f0ecb306549f1b289d6d2bec393714f65bbc6ab
Parents: c4a092c ed5533e
Author: Martyn Taylor <mt...@redhat.com>
Authored: Fri Apr 8 13:16:15 2016 +0100
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Fri Apr 8 13:16:15 2016 +0100

----------------------------------------------------------------------
 .../apache/activemq/artemis/core/server/ActiveMQServerLogger.java  | 2 +-
 .../apache/activemq/artemis/core/server/cluster/BackupManager.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------



[2/2] activemq-artemis git commit: [ARTEMIS-472] add cause to AMQ222137 warning

Posted by ma...@apache.org.
[ARTEMIS-472] add cause to AMQ222137 warning

JIRA: https://issues.apache.org/jira/browse/ARTEMIS-472


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

Branch: refs/heads/master
Commit: ed5533ecb6ebbde13d7d9cf13a0d72eb190ee8c8
Parents: c4a092c
Author: Jeff Mesnil <jm...@gmail.com>
Authored: Thu Apr 7 10:16:38 2016 +0200
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Fri Apr 8 13:16:15 2016 +0100

----------------------------------------------------------------------
 .../apache/activemq/artemis/core/server/ActiveMQServerLogger.java  | 2 +-
 .../apache/activemq/artemis/core/server/cluster/BackupManager.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ed5533ec/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 55f7268..6679008 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
@@ -886,7 +886,7 @@ public interface ActiveMQServerLogger extends BasicLogger {
 
    @LogMessage(level = Logger.Level.WARN)
    @Message(id = 222137, value = "Unable to announce backup, retrying", format = Message.Format.MESSAGE_FORMAT)
-   void errorAnnouncingBackup();
+   void errorAnnouncingBackup(@Cause Throwable e);
 
    @LogMessage(level = Logger.Level.WARN)
    @Message(id = 222138, value = "Local Member is not set at on ClusterConnection {0}", format = Message.Format.MESSAGE_FORMAT)

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ed5533ec/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/BackupManager.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/BackupManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/BackupManager.java
index cbb4141..ed7f641 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/BackupManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/BackupManager.java
@@ -259,7 +259,7 @@ public class BackupManager implements ActiveMQComponent {
                      return;
                   if (stopping)
                      return;
-                  ActiveMQServerLogger.LOGGER.errorAnnouncingBackup();
+                  ActiveMQServerLogger.LOGGER.errorAnnouncingBackup(e);
 
                   scheduledExecutor.schedule(new Runnable() {
                      @Override