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 2017/06/26 20:15:05 UTC
[1/2] activemq-artemis git commit: This closes #1364
Repository: activemq-artemis
Updated Branches:
refs/heads/master 1888e2ca4 -> 8a8023bf0
This closes #1364
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/8a8023bf
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/8a8023bf
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/8a8023bf
Branch: refs/heads/master
Commit: 8a8023bf0bfbe9444326973f4d18d60342b21575
Parents: 1888e2c 027faa3
Author: Clebert Suconic <cl...@apache.org>
Authored: Mon Jun 26 16:14:57 2017 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Jun 26 16:14:57 2017 -0400
----------------------------------------------------------------------
.../activemq/artemis/jms/bridge/ActiveMQJMSBridgeLogger.java | 4 ++++
.../apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java | 2 +-
.../activemq/artemis/jms/server/ActiveMQJMSServerLogger.java | 6 ++++++
.../activemq/artemis/jms/server/impl/JMSServerManagerImpl.java | 5 +----
4 files changed, 12 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
[2/2] activemq-artemis git commit: [ARTEMIS-1251] Log messages
without prefixed id code in artemis-jms-server
Posted by cl...@apache.org.
[ARTEMIS-1251] Log messages without prefixed id code in artemis-jms-server
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/027faa36
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/027faa36
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/027faa36
Branch: refs/heads/master
Commit: 027faa36d1680975e33f32d59f87710c7f3328c9
Parents: 1888e2c
Author: Dmitrii Tikhomirov <dt...@redhat.com>
Authored: Mon Jun 26 15:07:16 2017 +0200
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Jun 26 16:14:57 2017 -0400
----------------------------------------------------------------------
.../activemq/artemis/jms/bridge/ActiveMQJMSBridgeLogger.java | 4 ++++
.../apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java | 2 +-
.../activemq/artemis/jms/server/ActiveMQJMSServerLogger.java | 6 ++++++
.../activemq/artemis/jms/server/impl/JMSServerManagerImpl.java | 5 +----
4 files changed, 12 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/027faa36/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/ActiveMQJMSBridgeLogger.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/ActiveMQJMSBridgeLogger.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/ActiveMQJMSBridgeLogger.java
index 8ddd8fa..d75a4e6 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/ActiveMQJMSBridgeLogger.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/ActiveMQJMSBridgeLogger.java
@@ -95,6 +95,10 @@ public interface ActiveMQJMSBridgeLogger extends BasicLogger {
@Message(id = 342010, value = "Failed to connect JMS Bridge {0}", format = Message.Format.MESSAGE_FORMAT)
void bridgeConnectError(@Cause Exception e, String bridgeName);
+ @LogMessage(level = Logger.Level.WARN)
+ @Message(id = 342011, value = "Transaction rolled back, retrying TX", format = Message.Format.MESSAGE_FORMAT)
+ void transactionRolledBack(@Cause Exception e);
+
@LogMessage(level = Logger.Level.ERROR)
@Message(id = 344001, value = "JMS Bridge {0}, failed to start source connection", format = Message.Format.MESSAGE_FORMAT)
void jmsBridgeSrcConnectError(@Cause Exception e, String bridgeName);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/027faa36/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
index c8d64fe..19cac25 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
@@ -1311,7 +1311,7 @@ public final class JMSBridgeImpl implements JMSBridge {
try {
sendMessages();
} catch (TransactionRolledbackException e) {
- ActiveMQJMSBridgeLogger.LOGGER.warn(e.getMessage() + ", retrying TX", e);
+ ActiveMQJMSBridgeLogger.LOGGER.transactionRolledBack(e);
exHappened = true;
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/027faa36/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/ActiveMQJMSServerLogger.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/ActiveMQJMSServerLogger.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/ActiveMQJMSServerLogger.java
index fdbc514..0f1d709 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/ActiveMQJMSServerLogger.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/ActiveMQJMSServerLogger.java
@@ -97,6 +97,12 @@ public interface ActiveMQJMSServerLogger extends BasicLogger {
format = Message.Format.MESSAGE_FORMAT)
void failedToSendNotification(String notification);
+ @LogMessage(level = Logger.Level.WARN)
+ @Message(id = 122019,
+ value = "Unable to deactivate server",
+ format = Message.Format.MESSAGE_FORMAT)
+ void failedToDeactivateServer(@Cause Exception e);
+
@LogMessage(level = Logger.Level.DEBUG)
@Message(id = 123000, value = "JMS Server Manager Running cached command for {0}." + "(In the event of failover after failback has occurred, this message may be output multiple times.)",
format = Message.Format.MESSAGE_FORMAT)
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/027faa36/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
index c652dc6..0c381f1 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
@@ -95,7 +95,6 @@ import org.apache.activemq.artemis.utils.SelectorTranslator;
import org.apache.activemq.artemis.utils.TimeAndCounterIDGenerator;
import org.apache.activemq.artemis.utils.XMLUtil;
import org.apache.activemq.artemis.utils.collections.TypedProperties;
-import org.jboss.logging.Logger;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
@@ -147,8 +146,6 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
private final Map<String, List<String>> unRecoveredBindings = new HashMap<>();
- private static final Logger logger = Logger.getLogger(JMSServerManagerImpl.class);
-
public JMSServerManagerImpl(final ActiveMQServer server) throws Exception {
this.server = server;
@@ -250,7 +247,7 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
active = false;
}
} catch (Exception e) {
- logger.warn("Unable to deactivate server", e.getMessage(), e);
+ ActiveMQJMSServerLogger.LOGGER.failedToDeactivateServer(e);
}
}