You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by aa...@apache.org on 2023/03/06 14:20:59 UTC

[rocketmq] branch develop updated (c9975961f -> 236d4a164)

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

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


    from c9975961f Remove uncompatible sed in runserver.sh
     new 9214c69d8 Remove unnecessary property[append] for ConsoleAppender
     new 236d4a164 Apply AsyncAppender for broker

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 broker/src/main/resources/rmq.broker.logback.xml   | 75 +++++++++++++++++-----
 namesrv/src/main/resources/rmq.namesrv.logback.xml |  1 -
 2 files changed, 60 insertions(+), 16 deletions(-)


[rocketmq] 01/02: Remove unnecessary property[append] for ConsoleAppender

Posted by aa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 9214c69d83926057a888215b730601f0b42d7af4
Author: Aaron Ai <ya...@gmail.com>
AuthorDate: Mon Mar 6 15:16:33 2023 +0800

    Remove unnecessary property[append] for ConsoleAppender
---
 namesrv/src/main/resources/rmq.namesrv.logback.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/namesrv/src/main/resources/rmq.namesrv.logback.xml b/namesrv/src/main/resources/rmq.namesrv.logback.xml
index 826f3ca15..13033e092 100644
--- a/namesrv/src/main/resources/rmq.namesrv.logback.xml
+++ b/namesrv/src/main/resources/rmq.namesrv.logback.xml
@@ -81,7 +81,6 @@
     </appender>
 
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <append>true</append>
         <encoder>
             <pattern>%d{yyy-MM-dd HH:mm:ss,GMT+8} %p %t - %m%n</pattern>
             <charset class="java.nio.charset.Charset">UTF-8</charset>


[rocketmq] 02/02: Apply AsyncAppender for broker

Posted by aa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 236d4a164e4ba0a6d1d5db4c25225224ab206c5e
Author: Aaron Ai <ya...@gmail.com>
AuthorDate: Mon Mar 6 16:33:52 2023 +0800

    Apply AsyncAppender for broker
---
 broker/src/main/resources/rmq.broker.logback.xml | 75 +++++++++++++++++++-----
 1 file changed, 60 insertions(+), 15 deletions(-)

diff --git a/broker/src/main/resources/rmq.broker.logback.xml b/broker/src/main/resources/rmq.broker.logback.xml
index 94418ac9f..73a5f6009 100644
--- a/broker/src/main/resources/rmq.broker.logback.xml
+++ b/broker/src/main/resources/rmq.broker.logback.xml
@@ -18,7 +18,7 @@
 
 <configuration scan="true" scanPeriod="30 seconds">
 
-    <appender name="DefaultSiftingAppender" class="ch.qos.logback.classic.sift.SiftingAppender">
+    <appender name="DefaultSiftingAppender_inner" class="ch.qos.logback.classic.sift.SiftingAppender">
         <discriminator>
             <key>brokerContainerLogDir</key>
             <defaultValue>${file.separator}</defaultValue>
@@ -45,8 +45,11 @@
             </appender>
         </sift>
     </appender>
+    <appender name="DefaultSiftingAppender" class="ch.qos.logback.classic.AsyncAppender">
+        <appender-ref ref="DefaultSiftingAppender_inner"/>
+    </appender>
 
-    <appender name="RocketmqBrokerSiftingAppender" class="ch.qos.logback.classic.sift.SiftingAppender">
+    <appender name="RocketmqBrokerSiftingAppender_inner" class="ch.qos.logback.classic.sift.SiftingAppender">
         <discriminator>
             <key>brokerContainerLogDir</key>
             <defaultValue>${file.separator}</defaultValue>
@@ -72,8 +75,11 @@
             </appender>
         </sift>
     </appender>
+    <appender name="RocketmqBrokerSiftingAppender" class="ch.qos.logback.classic.AsyncAppender">
+        <appender-ref ref="RocketmqBrokerSiftingAppender_inner"/>
+    </appender>
 
-    <appender name="RocketmqProtectionSiftingAppender" class="ch.qos.logback.classic.sift.SiftingAppender">
+    <appender name="RocketmqProtectionSiftingAppender_inner" class="ch.qos.logback.classic.sift.SiftingAppender">
         <discriminator>
             <key>brokerContainerLogDir</key>
             <defaultValue>${file.separator}</defaultValue>
@@ -102,8 +108,11 @@
             </appender>
         </sift>
     </appender>
+    <appender name="RocketmqProtectionSiftingAppender" class="ch.qos.logback.classic.AsyncAppender">
+        <appender-ref ref="RocketmqProtectionSiftingAppender_inner"/>
+    </appender>
 
-    <appender name="RocketmqWaterMarkSiftingAppender" class="ch.qos.logback.classic.sift.SiftingAppender">
+    <appender name="RocketmqWaterMarkSiftingAppender_inner" class="ch.qos.logback.classic.sift.SiftingAppender">
         <discriminator>
             <key>brokerContainerLogDir</key>
             <defaultValue>${file.separator}</defaultValue>
@@ -132,8 +141,11 @@
             </appender>
         </sift>
     </appender>
+    <appender name="RocketmqWaterMarkSiftingAppender" class="ch.qos.logback.classic.AsyncAppender">
+        <appender-ref ref="RocketmqWaterMarkSiftingAppender_inner"/>
+    </appender>
 
-    <appender name="RocketmqStoreSiftingAppender" class="ch.qos.logback.classic.sift.SiftingAppender">
+    <appender name="RocketmqStoreSiftingAppender_inner" class="ch.qos.logback.classic.sift.SiftingAppender">
         <discriminator>
             <key>brokerContainerLogDir</key>
             <defaultValue>${file.separator}</defaultValue>
@@ -162,8 +174,11 @@
             </appender>
         </sift>
     </appender>
+    <appender name="RocketmqStoreSiftingAppender" class="ch.qos.logback.classic.AsyncAppender">
+        <appender-ref ref="RocketmqStoreSiftingAppender_inner"/>
+    </appender>
 
-    <appender name="RocketmqTieredStoreSiftingAppender" class="ch.qos.logback.classic.sift.SiftingAppender">
+    <appender name="RocketmqTieredStoreSiftingAppender_inner" class="ch.qos.logback.classic.sift.SiftingAppender">
         <discriminator>
             <key>brokerContainerLogDir</key>
             <defaultValue>${file.separator}</defaultValue>
@@ -192,8 +207,11 @@
             </appender>
         </sift>
     </appender>
+    <appender name="RocketmqTieredStoreSiftingAppender" class="ch.qos.logback.classic.AsyncAppender">
+        <appender-ref ref="RocketmqTieredStoreSiftingAppender_inner"/>
+    </appender>
 
-    <appender name="RocketmqTrafficSiftingAppender" class="ch.qos.logback.classic.sift.SiftingAppender">
+    <appender name="RocketmqTrafficSiftingAppender_inner" class="ch.qos.logback.classic.sift.SiftingAppender">
         <discriminator>
             <key>brokerContainerLogDir</key>
             <defaultValue>${file.separator}</defaultValue>
@@ -218,8 +236,11 @@
             </appender>
         </sift>
     </appender>
+    <appender name="RocketmqTrafficSiftingAppender" class="ch.qos.logback.classic.AsyncAppender">
+        <appender-ref ref="RocketmqTrafficSiftingAppender_inner"/>
+    </appender>
 
-    <appender name="RocketmqRemotingSiftingAppender" class="ch.qos.logback.classic.sift.SiftingAppender">
+    <appender name="RocketmqRemotingSiftingAppender_inner" class="ch.qos.logback.classic.sift.SiftingAppender">
         <discriminator>
             <key>brokerContainerLogDir</key>
             <defaultValue>${file.separator}</defaultValue>
@@ -248,8 +269,11 @@
             </appender>
         </sift>
     </appender>
+    <appender name="RocketmqRemotingSiftingAppender" class="ch.qos.logback.classic.AsyncAppender">
+        <appender-ref ref="RocketmqRemotingSiftingAppender_inner"/>
+    </appender>
 
-    <appender name="RocketmqStoreErrorSiftingAppender" class="ch.qos.logback.classic.sift.SiftingAppender">
+    <appender name="RocketmqStoreErrorSiftingAppender_inner" class="ch.qos.logback.classic.sift.SiftingAppender">
         <discriminator>
             <key>brokerContainerLogDir</key>
             <defaultValue>${file.separator}</defaultValue>
@@ -278,8 +302,11 @@
             </appender>
         </sift>
     </appender>
+    <appender name="RocketmqStoreErrorSiftingAppender" class="ch.qos.logback.classic.AsyncAppender">
+        <appender-ref ref="RocketmqStoreErrorSiftingAppender_inner"/>
+    </appender>
 
-    <appender name="RocketmqTransactionSiftingAppender" class="ch.qos.logback.classic.sift.SiftingAppender">
+    <appender name="RocketmqTransactionSiftingAppender_inner" class="ch.qos.logback.classic.sift.SiftingAppender">
         <discriminator>
             <key>brokerContainerLogDir</key>
             <defaultValue>${file.separator}</defaultValue>
@@ -308,8 +335,11 @@
             </appender>
         </sift>
     </appender>
+    <appender name="RocketmqTransactionSiftingAppender" class="ch.qos.logback.classic.AsyncAppender">
+        <appender-ref ref="RocketmqTransactionSiftingAppender_inner"/>
+    </appender>
 
-    <appender name="RocketmqRebalanceLockSiftingAppender" class="ch.qos.logback.classic.sift.SiftingAppender">
+    <appender name="RocketmqRebalanceLockSiftingAppender_inner" class="ch.qos.logback.classic.sift.SiftingAppender">
         <discriminator>
             <key>brokerContainerLogDir</key>
             <defaultValue>${file.separator}</defaultValue>
@@ -338,8 +368,11 @@
             </appender>
         </sift>
     </appender>
+    <appender name="RocketmqRebalanceLockSiftingAppender" class="ch.qos.logback.classic.AsyncAppender">
+        <appender-ref ref="RocketmqRebalanceLockSiftingAppender_inner"/>
+    </appender>
 
-    <appender name="RocketmqFilterSiftingAppender" class="ch.qos.logback.classic.sift.SiftingAppender">
+    <appender name="RocketmqFilterSiftingAppender_inner" class="ch.qos.logback.classic.sift.SiftingAppender">
         <discriminator>
             <key>brokerContainerLogDir</key>
             <defaultValue>${file.separator}</defaultValue>
@@ -368,8 +401,11 @@
             </appender>
         </sift>
     </appender>
+    <appender name="RocketmqRebalanceLockSiftingAppender" class="ch.qos.logback.classic.AsyncAppender">
+        <appender-ref ref="RocketmqFilterSiftingAppender_inner"/>
+    </appender>
 
-    <appender name="RocketmqStatsSiftingAppender" class="ch.qos.logback.classic.sift.SiftingAppender">
+    <appender name="RocketmqStatsSiftingAppender_inner" class="ch.qos.logback.classic.sift.SiftingAppender">
         <discriminator>
             <key>brokerContainerLogDir</key>
             <defaultValue>${file.separator}</defaultValue>
@@ -398,8 +434,11 @@
             </appender>
         </sift>
     </appender>
+    <appender name="RocketmqStatsSiftingAppender" class="ch.qos.logback.classic.AsyncAppender">
+        <appender-ref ref="RocketmqStatsSiftingAppender_inner"/>
+    </appender>
 
-    <appender name="RocketmqCommercialSiftingAppender" class="ch.qos.logback.classic.sift.SiftingAppender">
+    <appender name="RocketmqCommercialSiftingAppender_inner" class="ch.qos.logback.classic.sift.SiftingAppender">
         <discriminator>
             <key>brokerContainerLogDir</key>
             <defaultValue>${file.separator}</defaultValue>
@@ -424,8 +463,11 @@
             </appender>
         </sift>
     </appender>
+    <appender name="RocketmqCommercialSiftingAppender" class="ch.qos.logback.classic.AsyncAppender">
+        <appender-ref ref="RocketmqCommercialSiftingAppender_inner"/>
+    </appender>
 
-    <appender name="RocketmqPopSiftingAppender" class="ch.qos.logback.classic.sift.SiftingAppender">
+    <appender name="RocketmqPopSiftingAppender_inner" class="ch.qos.logback.classic.sift.SiftingAppender">
         <discriminator>
             <key>brokerContainerLogDir</key>
             <defaultValue>${file.separator}</defaultValue>
@@ -452,6 +494,9 @@
             </appender>
         </sift>
     </appender>
+    <appender name="RocketmqPopSiftingAppender" class="ch.qos.logback.classic.AsyncAppender">
+        <appender-ref ref="RocketmqPopSiftingAppender_inner"/>
+    </appender>
 
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>