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 6e32b351b6..f6b324833c 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 @@ -960,9 +960,9 @@ public interface ActiveMQServerLogger extends BasicLogger { void messageExceededMaxDeliverySendtoDLA(MessageReference ref, SimpleString name, SimpleString simpleString); @LogMessage(level = Logger.Level.WARN) - @Message(id = 222150, value = "Message has exceeded max delivery attempts. No Dead Letter Address configured for queue {0} so dropping it", + @Message(id = 222150, value = "Message {0} has exceeded max delivery attempts. No Dead Letter Address configured for queue {1} so dropping it", format = Message.Format.MESSAGE_FORMAT) - void messageExceededMaxDeliveryNoDLA(SimpleString name); + void messageExceededMaxDeliveryNoDLA(MessageReference ref, SimpleString name); @LogMessage(level = Logger.Level.WARN) @Message(id = 222151, value = "removing consumer which did not handle a message, consumer={0}, message={1}", diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java index bf6b725e6b..5ece228dda 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java @@ -2395,7 +2395,7 @@ public class QueueImpl implements Queue { move(tx, deadLetterAddress, ref, false, AckReason.KILLED); } } else { - ActiveMQServerLogger.LOGGER.messageExceededMaxDeliveryNoDLA(name); + ActiveMQServerLogger.LOGGER.messageExceededMaxDeliveryNoDLA(ref, name); ref.acknowledge(tx, AckReason.KILLED); }