[activemq] branch master updated: [AMQ-7443] Add connection remote addr in the prefetch warn log message

[jbonofre]

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/master by this push:
     new 7339e05  [AMQ-7443] Add connection remote addr in the prefetch warn 
log message
     new 4dc6903  Merge pull request #610 from jbonofre/AMQ-7443
7339e05 is described below

commit 7339e0516c39fe6736e8afd201bf176bbdd83950
Author: jbonofre <jbono...@apache.org>
AuthorDate: Wed Jan 13 06:23:28 2021 +0100

    [AMQ-7443] Add connection remote addr in the prefetch warn log message
---
 .../java/org/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 6f654a4..41c6a48 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,