From d5a2e7adecb06ca8664ec5d5240aa29f67e4212e Mon Sep 17 00:00:00 2001
From: juhuan <juhuan.wy@gmail.com>
Date: Thu, 26 Sep 2024 16:05:56 +0800
Subject: [PATCH] [ISSUE #8756] fix broker logback config, gzip the archive
 files.

---
 broker/src/main/resources/rmq.broker.logback.xml   | 14 ++++++++++----
 proxy/src/main/resources/rmq.proxy.logback.xml     |  5 ++---
 .../rmq-proxy-home/conf/logback_proxy.xml          |  5 ++---
 .../rmq-proxy-home/conf/logback_proxy.xml          |  5 ++---
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/broker/src/main/resources/rmq.broker.logback.xml b/broker/src/main/resources/rmq.broker.logback.xml
index fd63ef174da..ae1f59af7dd 100644
--- a/broker/src/main/resources/rmq.broker.logback.xml
+++ b/broker/src/main/resources/rmq.broker.logback.xml
@@ -508,10 +508,13 @@
         <sift>
             <appender name="RocketmqPopAppender"
                       class="ch.qos.logback.core.rolling.RollingFileAppender">
-                <file>${user.home}${file.separator}logs${file.separator}rocketmqlogs${file.separator}pop.log</file>
+                <file>
+                    ${user.home}${file.separator}logs${file.separator}rocketmqlogs${brokerLogDir:-${file.separator}}${brokerContainerLogDir}${file.separator}pop.log
+                </file>
                 <append>true</append>
                 <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-                    <fileNamePattern>${user.home}${file.separator}logs${file.separator}rocketmqlogs${file.separator}otherdays${file.separator}pop.%i.log
+                    <fileNamePattern>
+                        ${user.home}${file.separator}logs${file.separator}rocketmqlogs${brokerLogDir:-${file.separator}}${brokerContainerLogDir}${file.separator}otherdays${file.separator}pop.%i.log.gz
                     </fileNamePattern>
                     <minIndex>1</minIndex>
                     <maxIndex>20</maxIndex>
@@ -539,10 +542,13 @@
         <sift>
             <appender name="RocketmqColdCtrAppender"
                       class="ch.qos.logback.core.rolling.RollingFileAppender">
-                <file>${user.home}/logs/rocketmqlogs/coldctr.log</file>
+                <file>
+                    ${user.home}${file.separator}logs${file.separator}rocketmqlogs${brokerLogDir:-${file.separator}}${brokerContainerLogDir}${file.separator}coldctr.log
+                </file>
                 <append>true</append>
                 <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-                    <fileNamePattern>${user.home}/logs/rocketmqlogs/otherdays/coldctr.%i.log
+                    <fileNamePattern>
+                        ${user.home}${file.separator}logs${file.separator}rocketmqlogs${brokerLogDir:-${file.separator}}${brokerContainerLogDir}${file.separator}otherdays${file.separator}coldctr.%i.log.gz
                     </fileNamePattern>
                     <minIndex>1</minIndex>
                     <maxIndex>10</maxIndex>
diff --git a/proxy/src/main/resources/rmq.proxy.logback.xml b/proxy/src/main/resources/rmq.proxy.logback.xml
index f485dcbe3ca..2cb0dad4e1e 100644
--- a/proxy/src/main/resources/rmq.proxy.logback.xml
+++ b/proxy/src/main/resources/rmq.proxy.logback.xml
@@ -307,11 +307,10 @@
 
     <appender name="RocketmqPopAppender_inner"
               class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${user.home}${file.separator}logs${file.separator}rocketmqlogs${file.separator}pop.log</file>
+        <file>${user.home}${file.separator}logs${file.separator}rocketmqlogs${file.separator}${brokerLogDir:-${file.separator}}${file.separator}pop.log</file>
         <append>true</append>
         <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-            <fileNamePattern>${user.home}${file.separator}logs${file.separator}rocketmqlogs${file.separator}otherdays${file.separator}pop.%i.log
-            </fileNamePattern>
+            <fileNamePattern>${user.home}${file.separator}logs${file.separator}rocketmqlogs${file.separator}otherdays${file.separator}${brokerLogDir:-${file.separator}}${file.separator}pop.%i.log.gz</fileNamePattern>
             <minIndex>1</minIndex>
             <maxIndex>20</maxIndex>
         </rollingPolicy>
diff --git a/proxy/src/test/resources/rmq-proxy-home/conf/logback_proxy.xml b/proxy/src/test/resources/rmq-proxy-home/conf/logback_proxy.xml
index 091a51fcabf..933c464cd8d 100644
--- a/proxy/src/test/resources/rmq-proxy-home/conf/logback_proxy.xml
+++ b/proxy/src/test/resources/rmq-proxy-home/conf/logback_proxy.xml
@@ -303,11 +303,10 @@
 
     <appender name="RocketmqPopAppender_inner"
               class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${user.home}${file.separator}logs${file.separator}rocketmqlogs${file.separator}pop.log</file>
+        <file>${user.home}${file.separator}logs${file.separator}rocketmqlogs${file.separator}${brokerLogDir:-${file.separator}}${file.separator}pop.log</file>
         <append>true</append>
         <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-            <fileNamePattern>${user.home}${file.separator}logs${file.separator}rocketmqlogs${file.separator}otherdays${file.separator}pop.%i.log
-            </fileNamePattern>
+            <fileNamePattern>${user.home}${file.separator}logs${file.separator}rocketmqlogs${file.separator}otherdays${file.separator}${brokerLogDir:-${file.separator}}${file.separator}pop.%i.log.gz</fileNamePattern>
             <minIndex>1</minIndex>
             <maxIndex>20</maxIndex>
         </rollingPolicy>
diff --git a/test/src/test/resources/rmq-proxy-home/conf/logback_proxy.xml b/test/src/test/resources/rmq-proxy-home/conf/logback_proxy.xml
index 9019996884d..af64a75fd7d 100644
--- a/test/src/test/resources/rmq-proxy-home/conf/logback_proxy.xml
+++ b/test/src/test/resources/rmq-proxy-home/conf/logback_proxy.xml
@@ -303,11 +303,10 @@
 
     <appender name="RocketmqPopAppender_inner"
               class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${user.home}${file.separator}logs${file.separator}rocketmqlogs${file.separator}pop.log</file>
+        <file>${user.home}${file.separator}logs${file.separator}rocketmqlogs${file.separator}${brokerLogDir:-${file.separator}}${file.separator}pop.log</file>
         <append>true</append>
         <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-            <fileNamePattern>${user.home}${file.separator}logs${file.separator}rocketmqlogs${file.separator}otherdays${file.separator}qpop.%i.log
-            </fileNamePattern>
+            <fileNamePattern>${user.home}${file.separator}logs${file.separator}rocketmqlogs${file.separator}otherdays${file.separator}${brokerLogDir:-${file.separator}}${file.separator}pop.%i.log.gz</fileNamePattern>
             <minIndex>1</minIndex>
             <maxIndex>20</maxIndex>
         </rollingPolicy>