From f82209411c0df2dc7a5fe9139b77566b01e3da09 Mon Sep 17 00:00:00 2001 From: Zach Hoffman Date: Thu, 6 Jan 2022 15:11:49 -0700 Subject: [PATCH 1/2] Archive logs using an integer counter --- CHANGELOG.md | 1 + infrastructure/ansible/roles/traffic-router/defaults/main.yml | 4 ++-- traffic_router/core/src/main/conf/log4j2.xml | 4 ++-- traffic_router/core/src/test/conf/log4j2.xml | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0223767472..7386b984e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). - Traffic Ops: Sanitize username before executing LDAP query - [#6367](https://github.com/apache/trafficcontrol/issues/6367) - Fix PUT `user/current` to work with v4 User Roles and Permissions - [#6266](https://github.com/apache/trafficcontrol/issues/6266) - Removed postgresql13-devel requirement for traffic_ops +- [#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 ### Changed - Updated `t3c` to request less unnecessary deliveryservice-server assignment and invalidation jobs data via new query params supported by Traffic Ops diff --git a/infrastructure/ansible/roles/traffic-router/defaults/main.yml b/infrastructure/ansible/roles/traffic-router/defaults/main.yml index 2ef0434f14..107d9496d1 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: | + filePattern="{{tr_log_dir}}/access.log.%i" > @@ -145,7 +145,7 @@ tr_log4j2_opts: | + filePattern="{{tr_log_dir}}/traffic_router.log.%i" > diff --git a/traffic_router/core/src/main/conf/log4j2.xml b/traffic_router/core/src/main/conf/log4j2.xml index 33bdde4a65..bb3e2f93f1 100644 --- a/traffic_router/core/src/main/conf/log4j2.xml +++ b/traffic_router/core/src/main/conf/log4j2.xml @@ -20,7 +20,7 @@ + filePattern="${deploy.dir}/var/log/access.log.%i" > @@ -30,7 +30,7 @@ + filePattern="${deploy.dir}/var/log/traffic_router.log.%i" > diff --git a/traffic_router/core/src/test/conf/log4j2.xml b/traffic_router/core/src/test/conf/log4j2.xml index 33bdde4a65..bb3e2f93f1 100644 --- a/traffic_router/core/src/test/conf/log4j2.xml +++ b/traffic_router/core/src/test/conf/log4j2.xml @@ -20,7 +20,7 @@ + filePattern="${deploy.dir}/var/log/access.log.%i" > @@ -30,7 +30,7 @@ + filePattern="${deploy.dir}/var/log/traffic_router.log.%i" > From f858336645ad3cea447a3b6013097b4d248d114a Mon Sep 17 00:00:00 2001 From: Zach Hoffman Date: Thu, 6 Jan 2022 15:12:09 -0700 Subject: [PATCH 2/2] Keep a maximum of 1 archive of traffic_router.log (traffic_router.log.1) --- infrastructure/ansible/roles/traffic-router/defaults/main.yml | 1 + traffic_router/core/src/main/conf/log4j2.xml | 1 + traffic_router/core/src/test/conf/log4j2.xml | 1 + 3 files changed, 3 insertions(+) diff --git a/infrastructure/ansible/roles/traffic-router/defaults/main.yml b/infrastructure/ansible/roles/traffic-router/defaults/main.yml index 107d9496d1..0fa2313d1d 100644 --- a/infrastructure/ansible/roles/traffic-router/defaults/main.yml +++ b/infrastructure/ansible/roles/traffic-router/defaults/main.yml @@ -150,6 +150,7 @@ tr_log4j2_opts: | + diff --git a/traffic_router/core/src/main/conf/log4j2.xml b/traffic_router/core/src/main/conf/log4j2.xml index bb3e2f93f1..5984d9d0e4 100644 --- a/traffic_router/core/src/main/conf/log4j2.xml +++ b/traffic_router/core/src/main/conf/log4j2.xml @@ -35,6 +35,7 @@ + diff --git a/traffic_router/core/src/test/conf/log4j2.xml b/traffic_router/core/src/test/conf/log4j2.xml index bb3e2f93f1..5984d9d0e4 100644 --- a/traffic_router/core/src/test/conf/log4j2.xml +++ b/traffic_router/core/src/test/conf/log4j2.xml @@ -35,6 +35,7 @@ +