Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ISSUE #6256] Fix several issue about logback configuration #6257

Merged
merged 2 commits into from
Mar 6, 2023
Merged

[ISSUE #6256] Fix several issue about logback configuration #6257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b95ecf
Remove unnecessary property[append] for ConsoleAppender
aaron-ai Mar 6, 2023
003d73c
Apply AsyncAppender for broker
aaron-ai Mar 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 60 additions & 15 deletions broker/src/main/resources/rmq.broker.logback.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
1 change: 0 additions & 1 deletion namesrv/src/main/resources/rmq.namesrv.logback.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down