From 564b814f779fed2a2c1942f8b57aa5eb8e3bf982 Mon Sep 17 00:00:00 2001
From: Redkale <8730487+redkale@users.noreply.github.com>
Date: Fri, 25 Dec 2020 20:51:18 +0800
Subject: [PATCH]

---
 src/org/redkale/mq/HttpMessageProcessor.java | 4 ++--
 src/org/redkale/mq/MessageClient.java        | 7 ++++++-
 src/org/redkale/mq/SncpMessageProcessor.java | 4 ++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/org/redkale/mq/HttpMessageProcessor.java b/src/org/redkale/mq/HttpMessageProcessor.java
index b6c0bb22d..c134e88dc 100644
--- a/src/org/redkale/mq/HttpMessageProcessor.java
+++ b/src/org/redkale/mq/HttpMessageProcessor.java
@@ -101,9 +101,9 @@ public class HttpMessageProcessor implements MessageProcessor {
             HttpMessageResponse response = new HttpMessageResponse(context, request, callback, null, null, producer.getProducer(message));
             servlet.execute(request, response);
             long o = System.currentTimeMillis() - now;
-            if (cha > 1000 || e > 100 || o > 1000 || fine) {
+            if ((cha > 1000 || e > 100 || o > 1000) && fine) {
                 logger.log(Level.FINE, "HttpMessageProcessor.process (mqs.delays = " + cha + " ms, mqs.blocks = " + e + " ms, mqs.executes = " + o + " ms) message: " + message);
-            } else if (cha > 50 || e > 10 || o > 50 || finer) {
+            } else if ((cha > 50 || e > 10 || o > 50) && finer) {
                 logger.log(Level.FINER, "HttpMessageProcessor.process (mq.delays = " + cha + " ms, mq.blocks = " + e + " ms, mq.executes = " + o + " ms) message: " + message);
             } else if (finest) {
                 logger.log(Level.FINEST, "HttpMessageProcessor.process (mq.delay = " + cha + " ms, mq.block = " + e + " ms, mq.execute = " + o + " ms) message: " + message);
diff --git a/src/org/redkale/mq/MessageClient.java b/src/org/redkale/mq/MessageClient.java
index 1d76c6c8f..ab2e9e940 100644
--- a/src/org/redkale/mq/MessageClient.java
+++ b/src/org/redkale/mq/MessageClient.java
@@ -34,10 +34,13 @@ public abstract class MessageClient {
 
     protected boolean finer;
 
+    protected boolean fine;
+
     protected MessageClient(MessageAgent messageAgent) {
         this.messageAgent = messageAgent;
         this.finest = messageAgent == null ? false : messageAgent.logger.isLoggable(Level.FINEST);
         this.finer = messageAgent == null ? false : messageAgent.logger.isLoggable(Level.FINER);
+        this.fine = messageAgent == null ? false : messageAgent.logger.isLoggable(Level.FINE);
     }
 
     protected CompletableFuture<Void> close() {
@@ -63,7 +66,9 @@ public abstract class MessageClient {
                             if (ncer != null) ncer.decrementAndGet();
                             node.future.complete(msg);
                             long cha = now - msg.createtime;
-                            if (cha > 50 || finer) {
+                            if (cha > 1000 && fine) {
+                                messageAgent.logger.log(Level.FINER, "MessageRespFutureNode.process (mqs.delays = " + cha + "ms) message: " + msg);
+                            } else if (cha > 50 && finer) {
                                 messageAgent.logger.log(Level.FINER, "MessageRespFutureNode.process (mq.delays = " + cha + "ms) message: " + msg);
                             } else if (finest) {
                                 messageAgent.logger.log(Level.FINEST, "MessageRespFutureNode.process (mq.delay = " + cha + "ms) message: " + msg);
diff --git a/src/org/redkale/mq/SncpMessageProcessor.java b/src/org/redkale/mq/SncpMessageProcessor.java
index f1acf2bc7..b24ed0ff3 100644
--- a/src/org/redkale/mq/SncpMessageProcessor.java
+++ b/src/org/redkale/mq/SncpMessageProcessor.java
@@ -87,9 +87,9 @@ public class SncpMessageProcessor implements MessageProcessor {
             response = new SncpMessageResponse(context, request, callback, null, producer.getProducer(message));
             servlet.execute(request, response);
             long o = System.currentTimeMillis() - now;
-            if (cha > 1000 || e > 100 || o > 1000 || fine) {
+            if ((cha > 1000 || e > 100 || o > 1000) && fine) {
                 logger.log(Level.FINE, "SncpMessageProcessor.process (mqs.delays = " + cha + " ms, mqs.blocks = " + e + " ms, mqs.executes = " + o + " ms) message: " + message);
-            } else if (cha > 50 || e > 10 || o > 50 || finer) {
+            } else if ((cha > 50 || e > 10 || o > 50) && finer) {
                 logger.log(Level.FINER, "SncpMessageProcessor.process (mq.delays = " + cha + " ms, mq.blocks = " + e + " ms, mq.executes = " + o + " ms) message: " + message);
             } else if (finest) {
                 logger.log(Level.FINEST, "SncpMessageProcessor.process (mq.delay = " + cha + " ms, mq.block = " + e + " ms, mq.execute = " + o + " ms) message: " + message);