From e50a7e685fcf774ed7d747e56ed43c277170509e Mon Sep 17 00:00:00 2001
From: Jun Jeong <jjeong@atlassian.com>
Date: Tue, 16 May 2023 16:20:29 +1000
Subject: [PATCH] CLIP-1800: Added maxDays in access log valve

---
 README.md            | 6 ++++++
 config/server.xml.j2 | 3 ++-
 tests/test_image.py  | 8 ++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fe3f319..8031c79 100644
--- a/README.md
+++ b/README.md
@@ -141,6 +141,12 @@ see https://tomcat.apache.org/tomcat-7.0-doc/config/index.html
 * `ATL_TOMCAT_URIENCODING` (default: UTF-8)
 * `ATL_TOMCAT_MAXHTTPHEADERSIZE` (default: 8192)
 
+## Access Log Settings
+
+You can set the maximum number of days for access logs to be retained before being deleted. The default value of -1 means never delete old files.
+
+* `ATL_TOMCAT_ACCESS_LOGS_MAXDAYS` (default: -1)
+
 ## JVM configuration
 
 If you need to pass additional JVM arguments to Confluence such as specifying a
diff --git a/config/server.xml.j2 b/config/server.xml.j2
index 33273f5..86ae2e1 100644
--- a/config/server.xml.j2
+++ b/config/server.xml.j2
@@ -47,7 +47,8 @@
                  prefix="confluence_access"
                  suffix=".log"
                  rotatable="true"
-                 pattern="%h %{X-AUSERNAME}o %t &quot;%r&quot; %s %b %D %U %I &quot;%{User-Agent}i&quot;" />
+                 pattern="%h %{X-AUSERNAME}o %t &quot;%r&quot; %s %b %D %U %I &quot;%{User-Agent}i&quot;" 
+                 maxDays="{{ atl_tomcat_access_logs_maxdays | default('-1') }}"/>
           <Valve className="org.apache.catalina.valves.RemoteIpValve"
                  proxiesHeader="x-forwarded-by"
                  internalProxies="{{ atl_tomcat_proxy_internal_ips | default('') }}"
diff --git a/tests/test_image.py b/tests/test_image.py
index 4cc80d4..8d2498f 100644
--- a/tests/test_image.py
+++ b/tests/test_image.py
@@ -76,6 +76,8 @@ def test_server_xml_defaults(docker_cli, image):
     xml = parse_xml(container, f'{get_app_install_dir(container)}/conf/server.xml')
     connector = xml.find('.//Connector')
     context = xml.find('.//Context')
+    valve = xml.find('.//Valve[@className="org.apache.catalina.valves.AccessLogValve"]')
+
 
     assert connector.get('port') == '8090'
     assert connector.get('maxThreads') == '48'
@@ -95,6 +97,8 @@ def test_server_xml_defaults(docker_cli, image):
 
     assert context.get('path') == ''
 
+    assert valve.get('maxDays') == '-1'
+
 def test_server_xml_catalina_fallback(docker_cli, image):
     environment = {
         'CATALINA_CONNECTOR_PROXYNAME': 'PROXYNAME',
@@ -136,6 +140,7 @@ def test_server_xml_params(docker_cli, image):
         'ATL_PROXY_PORT': '443',
         'ATL_TOMCAT_MAXHTTPHEADERSIZE': '8193',
         'ATL_TOMCAT_CONTEXTPATH': '/myconf',
+        'ATL_TOMCAT_ACCESS_LOGS_MAXDAYS': '10',
     }
     container = run_image(docker_cli, image, environment=environment)
     _jvm = wait_for_proc(container, get_bootstrap_proc(container))
@@ -143,6 +148,7 @@ def test_server_xml_params(docker_cli, image):
     xml = parse_xml(container, f'{get_app_install_dir(container)}/conf/server.xml')
     connector = xml.find('.//Connector')
     context = xml.find('.//Context')
+    valve = xml.find('.//Valve[@className="org.apache.catalina.valves.AccessLogValve"]')
 
     assert xml.get('port') == environment.get('ATL_TOMCAT_MGMT_PORT')
 
@@ -164,6 +170,8 @@ def test_server_xml_params(docker_cli, image):
 
     assert context.get('path') == environment.get('ATL_TOMCAT_CONTEXTPATH')
 
+    assert valve.get('maxDays') == environment.get('ATL_TOMCAT_ACCESS_LOGS_MAXDAYS')
+
 def test_server_xml_access_log_enabled(docker_cli, image):
     environment = {
         'ATL_TOMCAT_ACCESS_LOG': 'true',