You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2017/06/12 17:51:16 UTC
[1/2] activemq-artemis git commit: This closes #1331
Repository: activemq-artemis
Updated Branches:
refs/heads/master 90edd572f -> de0eadfe5
This closes #1331
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/de0eadfe
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/de0eadfe
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/de0eadfe
Branch: refs/heads/master
Commit: de0eadfe53b3aad9f589deb998ff43bbfe5a7650
Parents: 90edd57 6ddeb96
Author: Justin Bertram <jb...@apache.org>
Authored: Mon Jun 12 12:39:33 2017 -0500
Committer: Justin Bertram <jb...@apache.org>
Committed: Mon Jun 12 12:39:33 2017 -0500
----------------------------------------------------------------------
.../activemq/artemis/core/client/ActiveMQClientLogger.java | 9 +++++++++
.../artemis/jms/client/ActiveMQMessageConsumer.java | 2 +-
.../org/apache/activemq/artemis/jndi/ReadOnlyContext.java | 2 +-
3 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/2] activemq-artemis git commit: [ARTEMIS-1226] Log messages
without prefixed id code in artemis-jms-client
Posted by jb...@apache.org.
[ARTEMIS-1226] Log messages without prefixed id code in artemis-jms-client
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/6ddeb96a
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/6ddeb96a
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/6ddeb96a
Branch: refs/heads/master
Commit: 6ddeb96a8a8ddf70028973e47cab5df3cb3d3972
Parents: 90edd57
Author: Dmitrii Tikhomirov <dt...@redhat.com>
Authored: Mon Jun 12 13:24:57 2017 +0200
Committer: Justin Bertram <jb...@apache.org>
Committed: Mon Jun 12 12:39:33 2017 -0500
----------------------------------------------------------------------
.../activemq/artemis/core/client/ActiveMQClientLogger.java | 9 +++++++++
.../artemis/jms/client/ActiveMQMessageConsumer.java | 2 +-
.../org/apache/activemq/artemis/jndi/ReadOnlyContext.java | 2 +-
3 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6ddeb96a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java
index 748e508..6382147 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java
@@ -315,6 +315,11 @@ public interface ActiveMQClientLogger extends BasicLogger {
format = Message.Format.MESSAGE_FORMAT)
void timeoutStreamingLargeMessage();
+ @LogMessage(level = Logger.Level.WARN)
+ @Message(id = 212058, value = "Unable to get a message.",
+ format = Message.Format.MESSAGE_FORMAT)
+ void unableToGetMessage(@Cause Exception e);
+
@LogMessage(level = Logger.Level.ERROR)
@Message(id = 214000, value = "Failed to call onMessage", format = Message.Format.MESSAGE_FORMAT)
void onMessageError(@Cause Throwable e);
@@ -442,4 +447,8 @@ public interface ActiveMQClientLogger extends BasicLogger {
@Message(id = 214029, value = "Unexpected response from HTTP server: %s")
void unexpectedResponseFromHttpServer(Object response);
+ @LogMessage(level = Logger.Level.ERROR)
+ @Message(id = 214030, value = "Failed to bind {0}={1}", format = Message.Format.MESSAGE_FORMAT)
+ void failedToBind(String p1, String p2, @Cause Throwable cause);
+
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6ddeb96a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageConsumer.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageConsumer.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageConsumer.java
index 1af2aa6..3d7fa56 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageConsumer.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageConsumer.java
@@ -229,7 +229,7 @@ public final class ActiveMQMessageConsumer implements QueueReceiver, TopicSubscr
// nothing better than keep it for future investigations in case it happened again
IndexOutOfBoundsException newIOOB = new IndexOutOfBoundsException(ioob.getMessage() + "@" + jmsMsg.getCoreMessage());
newIOOB.initCause(ioob);
- ActiveMQClientLogger.LOGGER.warn(newIOOB.getMessage(), newIOOB);
+ ActiveMQClientLogger.LOGGER.unableToGetMessage(newIOOB);
throw ioob;
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6ddeb96a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/ReadOnlyContext.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/ReadOnlyContext.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/ReadOnlyContext.java
index 0fb6269..d032d07 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/ReadOnlyContext.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/ReadOnlyContext.java
@@ -101,7 +101,7 @@ public class ReadOnlyContext implements Context, Serializable {
try {
internalBind(binding.getKey(), binding.getValue());
} catch (Throwable e) {
- ActiveMQClientLogger.LOGGER.error("Failed to bind " + binding.getKey() + "=" + binding.getValue(), e);
+ ActiveMQClientLogger.LOGGER.failedToBind(binding.getKey(), binding.getValue().toString(), e);
}
}
}