This is an automated email from the ASF dual-hosted git repository. ocket8888 pushed a commit to branch 5.1.x in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
commit ff8566fbf69bea450afaac5979ce225c1c7cb0a3 Author: Zach Hoffman <[email protected]> AuthorDate: Thu Jan 6 23:46:44 2022 -0800 TR logging: Archive logs using an integer counter (#6450) * Archive logs using an integer counter * Keep a maximum of 1 archive of traffic_router.log (traffic_router.log.1) (cherry picked from commit 47e7e6668316cf90ba0fc0115c09a69208484725) --- CHANGELOG.md | 3 +++ infrastructure/ansible/roles/traffic-router/defaults/main.yml | 5 +++-- traffic_router/core/src/main/conf/log4j2.xml | 5 +++-- traffic_router/core/src/test/conf/log4j2.xml | 5 +++-- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e6664d0..00a04eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,9 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). +## [5.1.6] - 2022-01-12 +- [#6446](https://github.com/apache/trafficcontrol/issues/6446) - Revert Traffic Router rollover file pattern to the one previously used in `log4j.properties` with Log4j 1.2 + ## [5.1.5] - 2021-12-20 - Updated `log4j` module in Traffic Router from version 1.2.17 to 2.17.0 diff --git a/infrastructure/ansible/roles/traffic-router/defaults/main.yml b/infrastructure/ansible/roles/traffic-router/defaults/main.yml index a8f94b0..6aaddf1 100644 --- a/infrastructure/ansible/roles/traffic-router/defaults/main.yml +++ b/infrastructure/ansible/roles/traffic-router/defaults/main.yml @@ -135,7 +135,7 @@ tr_log4j2_opts: | </Console> <RollingFile name="traffic_router_access" fileName="{{tr_log_dir}}/access.log" - filePattern="{{tr_log_dir}}/access-%d{yyyy-MM-dd}.log" > + filePattern="{{tr_log_dir}}/access.log.%i" > <PatternLayout pattern="%m%n" /> <Policies> <SizeBasedTriggeringPolicy size="200MB" /> @@ -145,11 +145,12 @@ tr_log4j2_opts: | </RollingFile> <RollingFile name="traffic_router" fileName="{{tr_log_dir}}/traffic_router.log" - filePattern="{{tr_log_dir}}/traffic_router-%d{yyyy-MM-dd}.log" > + filePattern="{{tr_log_dir}}/traffic_router.log.%i" > <PatternLayout pattern="%-5p %d{yyyy-MM-dd'T'HH:mm:ss.SSS} [%t] %c - %m%n" /> <Policies> <SizeBasedTriggeringPolicy size="100MB" /> </Policies> + <DefaultRolloverStrategy max="1" /> <ThresholdFilter level="ALL" /> </RollingFile> </Appenders> diff --git a/traffic_router/core/src/main/conf/log4j2.xml b/traffic_router/core/src/main/conf/log4j2.xml index 7b0bcd3..a91bb7f 100644 --- a/traffic_router/core/src/main/conf/log4j2.xml +++ b/traffic_router/core/src/main/conf/log4j2.xml @@ -20,7 +20,7 @@ </Console> <RollingFile name="traffic_router_access" fileName="${deploy.dir}/var/log/access.log" - filePattern="${deploy.dir}/var/log/access-%d{yyyy-MM-dd}.log" > + filePattern="${deploy.dir}/var/log/access.log.%i" > <PatternLayout pattern="%m%n" /> <Policies> <SizeBasedTriggeringPolicy size="200MB" /> @@ -30,11 +30,12 @@ </RollingFile> <RollingFile name="traffic_router" fileName="${deploy.dir}/var/log/traffic_router.log" - filePattern="${deploy.dir}/var/log/traffic_router-%d{yyyy-MM-dd}.log" > + filePattern="${deploy.dir}/var/log/traffic_router.log.%i" > <PatternLayout pattern="%-5p %d{yyyy-MM-dd'T'HH:mm:ss.SSS} [%t] %c - %m%n" /> <Policies> <SizeBasedTriggeringPolicy size="100MB" /> </Policies> + <DefaultRolloverStrategy max="1" /> <ThresholdFilter level="ALL" /> </RollingFile> </Appenders> diff --git a/traffic_router/core/src/test/conf/log4j2.xml b/traffic_router/core/src/test/conf/log4j2.xml index 7b0bcd3..a91bb7f 100644 --- a/traffic_router/core/src/test/conf/log4j2.xml +++ b/traffic_router/core/src/test/conf/log4j2.xml @@ -20,7 +20,7 @@ </Console> <RollingFile name="traffic_router_access" fileName="${deploy.dir}/var/log/access.log" - filePattern="${deploy.dir}/var/log/access-%d{yyyy-MM-dd}.log" > + filePattern="${deploy.dir}/var/log/access.log.%i" > <PatternLayout pattern="%m%n" /> <Policies> <SizeBasedTriggeringPolicy size="200MB" /> @@ -30,11 +30,12 @@ </RollingFile> <RollingFile name="traffic_router" fileName="${deploy.dir}/var/log/traffic_router.log" - filePattern="${deploy.dir}/var/log/traffic_router-%d{yyyy-MM-dd}.log" > + filePattern="${deploy.dir}/var/log/traffic_router.log.%i" > <PatternLayout pattern="%-5p %d{yyyy-MM-dd'T'HH:mm:ss.SSS} [%t] %c - %m%n" /> <Policies> <SizeBasedTriggeringPolicy size="100MB" /> </Policies> + <DefaultRolloverStrategy max="1" /> <ThresholdFilter level="ALL" /> </RollingFile> </Appenders>
