[incubator-tubemq] branch master updated: [TUBEMQ-87] Minor updates (#68)

[go...@apache.org]

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

gosonzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-tubemq.git


The following commit(s) were added to refs/heads/master by this push:
     new 22c0fad  [TUBEMQ-87] Minor updates (#68)
22c0fad is described below

commit 22c0fade59b734f2ee11011ba3b28ca59cceb07e
Author: Tboy <gu...@immomo.com>
AuthorDate: Wed May 6 09:59:37 2020 +0800

    [TUBEMQ-87] Minor updates (#68)
---
 .../src/main/java/org/apache/tubemq/corerpc/netty/NettyClient.java    | 3 +--
 .../main/java/org/apache/tubemq/example/MessageConsumerExample.java   | 4 ++--
 .../org/apache/tubemq/server/broker/msgstore/MessageStoreManager.java | 4 +---
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/tubemq-core/src/main/java/org/apache/tubemq/corerpc/netty/NettyClient.java b/tubemq-core/src/main/java/org/apache/tubemq/corerpc/netty/NettyClient.java
index 6d063e0..cbadd56 100644
--- a/tubemq-core/src/main/java/org/apache/tubemq/corerpc/netty/NettyClient.java
+++ b/tubemq-core/src/main/java/org/apache/tubemq/corerpc/netty/NettyClient.java
@@ -379,8 +379,7 @@ public class NettyClient implements Client {
                     logger.info("Close client {} due to idle.", e.getChannel());
                 }
                 if (t instanceof UnresolvedAddressException) {
-                    logger
-                            .info("UnresolvedAddressException for connect {} closed.", addressInfo.getHostPortStr());
+                    logger.info("UnresolvedAddressException for connect {} closed.", addressInfo.getHostPortStr());
                 }
                 NettyClient.this.close();
             } else {
diff --git a/tubemq-example/src/main/java/org/apache/tubemq/example/MessageConsumerExample.java b/tubemq-example/src/main/java/org/apache/tubemq/example/MessageConsumerExample.java
index 1f91377..ba88937 100644
--- a/tubemq-example/src/main/java/org/apache/tubemq/example/MessageConsumerExample.java
+++ b/tubemq-example/src/main/java/org/apache/tubemq/example/MessageConsumerExample.java
@@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
  * This demo shows how to consume message sequentially.
  *
  * <p>Consumer supports subscribe multiple topics in one consume group. Message from subscription
- * sent back to business logic via callback {@link MessageListener}. It is highly recommended NOT
+ * sent back to business logic via callback {@link MessageV2Listener}. It is highly recommended NOT
  * to perform any blocking operation inside the callback.
  *
  * <p>As for consumption control of {@link PushMessageConsumer}, business logic is able to monitor
@@ -120,7 +120,7 @@ public final class MessageConsumerExample {
             }
         });
 
-        final Thread statisticThread = new Thread(msgRecvStats, "Sent Statistic Thread");
+        final Thread statisticThread = new Thread(msgRecvStats, "Received Statistic Thread");
         statisticThread.start();
 
         executorService.shutdown();
diff --git a/tubemq-server/src/main/java/org/apache/tubemq/server/broker/msgstore/MessageStoreManager.java b/tubemq-server/src/main/java/org/apache/tubemq/server/broker/msgstore/MessageStoreManager.java
index 15081ef..74e0d91 100644
--- a/tubemq-server/src/main/java/org/apache/tubemq/server/broker/msgstore/MessageStoreManager.java
+++ b/tubemq-server/src/main/java/org/apache/tubemq/server/broker/msgstore/MessageStoreManager.java
@@ -695,6 +695,7 @@ public class MessageStoreManager implements StoreService {
                         }
                     }
                 }
+                logger.info("Log Clear Scheduler finished file delete!");
             }
             long dltTime = System.currentTimeMillis() - startTime;
             if (dltTime >= tubeConfig.getLogClearupDurationMs()) {
@@ -703,9 +704,6 @@ public class MessageStoreManager implements StoreService {
                         .append(tubeConfig.getLogClearupDurationMs()).toString());
                 sBuilder.delete(0, sBuilder.length());
             }
-            if (!expiredTopic.isEmpty()) {
-                logger.info("Log Clear Scheduler finished file delete!");
-            }
         }
 
         private Set<String> getExpiredTopicSet(final StringBuilder sb) {