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 @@ - ${user.home}${file.separator}logs${file.separator}rocketmqlogs${file.separator}pop.log + + ${user.home}${file.separator}logs${file.separator}rocketmqlogs${brokerLogDir:-${file.separator}}${brokerContainerLogDir}${file.separator}pop.log + true - ${user.home}${file.separator}logs${file.separator}rocketmqlogs${file.separator}otherdays${file.separator}pop.%i.log + + ${user.home}${file.separator}logs${file.separator}rocketmqlogs${brokerLogDir:-${file.separator}}${brokerContainerLogDir}${file.separator}otherdays${file.separator}pop.%i.log.gz 1 20 @@ -539,10 +542,13 @@ - ${user.home}/logs/rocketmqlogs/coldctr.log + + ${user.home}${file.separator}logs${file.separator}rocketmqlogs${brokerLogDir:-${file.separator}}${brokerContainerLogDir}${file.separator}coldctr.log + true - ${user.home}/logs/rocketmqlogs/otherdays/coldctr.%i.log + + ${user.home}${file.separator}logs${file.separator}rocketmqlogs${brokerLogDir:-${file.separator}}${brokerContainerLogDir}${file.separator}otherdays${file.separator}coldctr.%i.log.gz 1 10 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 @@ - ${user.home}${file.separator}logs${file.separator}rocketmqlogs${file.separator}pop.log + ${user.home}${file.separator}logs${file.separator}rocketmqlogs${file.separator}${brokerLogDir:-${file.separator}}${file.separator}pop.log true - ${user.home}${file.separator}logs${file.separator}rocketmqlogs${file.separator}otherdays${file.separator}pop.%i.log - + ${user.home}${file.separator}logs${file.separator}rocketmqlogs${file.separator}otherdays${file.separator}${brokerLogDir:-${file.separator}}${file.separator}pop.%i.log.gz 1 20 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 @@ - ${user.home}${file.separator}logs${file.separator}rocketmqlogs${file.separator}pop.log + ${user.home}${file.separator}logs${file.separator}rocketmqlogs${file.separator}${brokerLogDir:-${file.separator}}${file.separator}pop.log true - ${user.home}${file.separator}logs${file.separator}rocketmqlogs${file.separator}otherdays${file.separator}pop.%i.log - + ${user.home}${file.separator}logs${file.separator}rocketmqlogs${file.separator}otherdays${file.separator}${brokerLogDir:-${file.separator}}${file.separator}pop.%i.log.gz 1 20 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 @@ - ${user.home}${file.separator}logs${file.separator}rocketmqlogs${file.separator}pop.log + ${user.home}${file.separator}logs${file.separator}rocketmqlogs${file.separator}${brokerLogDir:-${file.separator}}${file.separator}pop.log true - ${user.home}${file.separator}logs${file.separator}rocketmqlogs${file.separator}otherdays${file.separator}qpop.%i.log - + ${user.home}${file.separator}logs${file.separator}rocketmqlogs${file.separator}otherdays${file.separator}${brokerLogDir:-${file.separator}}${file.separator}pop.%i.log.gz 1 20