From 7339e0516c39fe6736e8afd201bf176bbdd83950 Mon Sep 17 00:00:00 2001 From: jbonofre Date: Wed, 13 Jan 2021 06:23:28 +0100 Subject: [PATCH] [AMQ-7443] Add connection remote addr in the prefetch warn log message --- .../apache/activemq/broker/region/TopicSubscription.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/TopicSubscription.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/TopicSubscription.java index 6f654a4622..41c6a48912 100644 --- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/TopicSubscription.java +++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/TopicSubscription.java @@ -116,7 +116,11 @@ public class TopicSubscription extends AbstractSubscription { if (info.getPrefetchSize() > 1 && matched.size() > info.getPrefetchSize()) { // Slow consumers should log and set their state as such. if (!isSlowConsumer()) { - LOG.warn("{}: has twice its prefetch limit pending, without an ack; it appears to be slow", toString()); + String remoteAddr = null; + if (context != null && context.getConnection() != null) { + remoteAddr = context.getConnection().getRemoteAddress(); + } + LOG.warn("{}: has twice its prefetch limit pending, without an ack; it appears to be slow{}", toString(), (remoteAddr != null) ? ": " + remoteAddr : ""); setSlowConsumer(true); for (Destination dest: destinations) { dest.slowConsumer(getContext(), this); @@ -133,7 +137,7 @@ public class TopicSubscription extends AbstractSubscription { return; } if (!warnedAboutWait) { - LOG.info("{}: Pending message cursor [{}] is full, temp usag ({}%) or memory usage ({}%) limit reached, blocking message add() pending the release of resources.", + LOG.info("{}: Pending message cursor [{}] is full, temp usage ({}%) or memory usage ({}%) limit reached, blocking message add() pending the release of resources.", new Object[]{ toString(), matched,