This is an automated email from the ASF dual-hosted git repository.
srijeet0406 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new 47e7e66 TR logging: Archive logs using an integer counter (#6450)
47e7e66 is described below
commit 47e7e6668316cf90ba0fc0115c09a69208484725
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)
---
CHANGELOG.md | 1 +
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, 10 insertions(+), 6 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0223767..7386b98 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 2ef0434..0fa2313 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 33bdde4..5984d9d 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 33bdde4..5984d9d 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>
