(rocketmq) branch develop updated: [ISSUE #8291] format proxy watermark output (#8292)

[zhouxzhan]

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

zhouxzhan pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git


The following commit(s) were added to refs/heads/develop by this push:
     new b330130932 [ISSUE #8291] format proxy watermark output (#8292)
b330130932 is described below

commit b3301309327f541c72ade1786f5ea7a3c750811c
Author: zzl <87265072+zhilia...@users.noreply.github.com>
AuthorDate: Mon Jun 24 15:55:03 2024 +0800

    [ISSUE #8291] format proxy watermark output (#8292)
---
 .../java/org/apache/rocketmq/common/thread/ThreadPoolMonitor.java  | 7 +++----
 proxy/src/main/resources/rmq.proxy.logback.xml                     | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git 
a/common/src/main/java/org/apache/rocketmq/common/thread/ThreadPoolMonitor.java 
b/common/src/main/java/org/apache/rocketmq/common/thread/ThreadPoolMonitor.java
index 1bfabbffed..746128d296 100644
--- 
a/common/src/main/java/org/apache/rocketmq/common/thread/ThreadPoolMonitor.java
+++ 
b/common/src/main/java/org/apache/rocketmq/common/thread/ThreadPoolMonitor.java
@@ -105,10 +105,9 @@ public class ThreadPoolMonitor {
             List<ThreadPoolStatusMonitor> monitors = 
threadPoolWrapper.getStatusPrinters();
             for (ThreadPoolStatusMonitor monitor : monitors) {
                 double value = 
monitor.value(threadPoolWrapper.getThreadPoolExecutor());
-                waterMarkLogger.info("\t{}\t{}\t{}", 
threadPoolWrapper.getName(),
-                    monitor.describe(),
-                    value);
-
+                String nameFormatted = String.format("%-40s", 
threadPoolWrapper.getName());
+                String descFormatted = String.format("%-12s", 
monitor.describe());
+                waterMarkLogger.info("{}{}{}", nameFormatted, descFormatted, 
value);
                 if (enablePrintJstack) {
                     if 
(monitor.needPrintJstack(threadPoolWrapper.getThreadPoolExecutor(), value) &&
                         System.currentTimeMillis() - jstackTime > 
jstackPeriodTime) {
diff --git a/proxy/src/main/resources/rmq.proxy.logback.xml 
b/proxy/src/main/resources/rmq.proxy.logback.xml
index b44b22a698..f485dcbe3c 100644
--- a/proxy/src/main/resources/rmq.proxy.logback.xml
+++ b/proxy/src/main/resources/rmq.proxy.logback.xml
@@ -52,7 +52,7 @@
             <maxFileSize>128MB</maxFileSize>
         </triggeringPolicy>
         <encoder>
-            <pattern>%d{yyy-MM-dd HH:mm:ss,GMT+8}%m%n</pattern>
+            <pattern>%d{yyy-MM-dd HH:mm:ss,GMT+8} %m%n</pattern>
             <charset class="java.nio.charset.Charset">UTF-8</charset>
         </encoder>
     </appender>