Commit 596f0c28 authored by Dmytro Nosan's avatar Dmytro Nosan Committed by Stephane Nicoll

Expose Tomcat AccessLog Max days property

See gh-15954
parent be40d000
...@@ -609,6 +609,19 @@ public class ServerProperties { ...@@ -609,6 +609,19 @@ public class ServerProperties {
*/ */
private boolean buffered = true; private boolean buffered = true;
/**
* The number of days to retain the access log files before they are removed.
*/
private int maxDays = -1;
public int getMaxDays() {
return this.maxDays;
}
public void setMaxDays(int maxDays) {
this.maxDays = maxDays;
}
public boolean isEnabled() { public boolean isEnabled() {
return this.enabled; return this.enabled;
} }
......
...@@ -263,6 +263,7 @@ public class TomcatWebServerFactoryCustomizer implements ...@@ -263,6 +263,7 @@ public class TomcatWebServerFactoryCustomizer implements
tomcatProperties.getAccesslog().isRequestAttributesEnabled()); tomcatProperties.getAccesslog().isRequestAttributesEnabled());
valve.setRotatable(tomcatProperties.getAccesslog().isRotate()); valve.setRotatable(tomcatProperties.getAccesslog().isRotate());
valve.setBuffered(tomcatProperties.getAccesslog().isBuffered()); valve.setBuffered(tomcatProperties.getAccesslog().isBuffered());
valve.setMaxDays(tomcatProperties.getAccesslog().getMaxDays());
factory.addEngineValves(valve); factory.addEngineValves(valve);
} }
......
...@@ -325,6 +325,23 @@ public class TomcatWebServerFactoryCustomizerTests { ...@@ -325,6 +325,23 @@ public class TomcatWebServerFactoryCustomizerTests {
assertThat(factory.getEngineValves()).isEmpty(); assertThat(factory.getEngineValves()).isEmpty();
} }
@Test
public void accessLogSetMaxDays() {
bind("server.tomcat.accesslog.enabled=true",
"server.tomcat.accesslog.max-days=20");
TomcatServletWebServerFactory factory = customizeAndGetFactory();
assertThat(((AccessLogValve) factory.getEngineValves().iterator().next())
.getMaxDays()).isEqualTo(20);
}
@Test
public void accessLogDefaultMaxDays() {
bind("server.tomcat.accesslog.enabled=true");
TomcatServletWebServerFactory factory = customizeAndGetFactory();
assertThat(((AccessLogValve) factory.getEngineValves().iterator().next())
.getMaxDays()).isEqualTo(-1);
}
private void bind(String... inlinedProperties) { private void bind(String... inlinedProperties) {
TestPropertySourceUtils.addInlinedPropertiesToEnvironment(this.environment, TestPropertySourceUtils.addInlinedPropertiesToEnvironment(this.environment,
inlinedProperties); inlinedProperties);
......
...@@ -255,6 +255,7 @@ content into your application. Rather, pick only the properties that you need. ...@@ -255,6 +255,7 @@ content into your application. Rather, pick only the properties that you need.
server.tomcat.accesslog.directory=logs # Directory in which log files are created. Can be absolute or relative to the Tomcat base dir. server.tomcat.accesslog.directory=logs # Directory in which log files are created. Can be absolute or relative to the Tomcat base dir.
server.tomcat.accesslog.enabled=false # Enable access log. server.tomcat.accesslog.enabled=false # Enable access log.
server.tomcat.accesslog.file-date-format=.yyyy-MM-dd # Date format to place in the log file name. server.tomcat.accesslog.file-date-format=.yyyy-MM-dd # Date format to place in the log file name.
server.tomcat.accesslog.max-days=-1#The number of days to retain the access log files before they are removed.
server.tomcat.accesslog.pattern=common # Format pattern for access logs. server.tomcat.accesslog.pattern=common # Format pattern for access logs.
server.tomcat.accesslog.prefix=access_log # Log file name prefix. server.tomcat.accesslog.prefix=access_log # Log file name prefix.
server.tomcat.accesslog.rename-on-rotate=false # Whether to defer inclusion of the date stamp in the file name until rotate time. server.tomcat.accesslog.rename-on-rotate=false # Whether to defer inclusion of the date stamp in the file name until rotate time.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment