From b8ecdeb19c573289a839f4ce210bc0998bdc68e4 Mon Sep 17 00:00:00 2001 From: Dmitrii Tikhomirov Date: Mon, 12 Jun 2017 13:24:57 +0200 Subject: [PATCH] [ARTEMIS-1226] Log messages without prefixed id code in artemis-jms-client --- .../artemis/core/client/ActiveMQClientLogger.java | 9 +++++++++ .../artemis/jms/client/ActiveMQMessageConsumer.java | 2 +- .../apache/activemq/artemis/jndi/ReadOnlyContext.java | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) 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 748e508bc26..63821471308 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); + } 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 1af2aa64136..3d7fa56fc39 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 @@ private ActiveMQMessage getMessage(final long timeout, final boolean noWait) thr // 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; } 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 0fb62694d92..d032d075e4d 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 ReadOnlyContext(Hashtable environment, Map bindings) { 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); } } }