Merge pull request #8474 from Nowheresly:gh-8396
* pr/8474: Polish contribution Add Tomcat Access Log's fileDateFormat property
This commit is contained in:
commit
cbde6ed096
|
@ -1006,6 +1006,7 @@ public class ServerProperties
|
|||
this.accesslog.isRequestAttributesEnabled());
|
||||
valve.setRotatable(this.accesslog.isRotate());
|
||||
valve.setBuffered(this.accesslog.isBuffered());
|
||||
valve.setFileDateFormat(this.accesslog.getFileDateFormat());
|
||||
factory.addEngineValves(valve);
|
||||
}
|
||||
|
||||
|
@ -1060,6 +1061,11 @@ public class ServerProperties
|
|||
*/
|
||||
private boolean renameOnRotate;
|
||||
|
||||
/**
|
||||
* Date format to place in log file name.
|
||||
*/
|
||||
private String fileDateFormat = ".yyyy-MM-dd";
|
||||
|
||||
/**
|
||||
* Set request attributes for IP address, Hostname, protocol and port used for
|
||||
* the request.
|
||||
|
@ -1127,6 +1133,14 @@ public class ServerProperties
|
|||
this.renameOnRotate = renameOnRotate;
|
||||
}
|
||||
|
||||
public String getFileDateFormat() {
|
||||
return this.fileDateFormat;
|
||||
}
|
||||
|
||||
public void setFileDateFormat(String fileDateFormat) {
|
||||
this.fileDateFormat = fileDateFormat;
|
||||
}
|
||||
|
||||
public boolean isRequestAttributesEnabled() {
|
||||
return this.requestAttributesEnabled;
|
||||
}
|
||||
|
|
|
@ -160,6 +160,29 @@ public class ServerPropertiesTests {
|
|||
.isInstanceOf(AccessLogValve.class);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void tomcatAccessLogFileDateFormatByDefault() {
|
||||
TomcatEmbeddedServletContainerFactory tomcatContainer = new TomcatEmbeddedServletContainerFactory();
|
||||
Map<String, String> map = new HashMap<String, String>();
|
||||
map.put("server.tomcat.accesslog.enabled", "true");
|
||||
bindProperties(map);
|
||||
this.properties.customize(tomcatContainer);
|
||||
assertThat(((AccessLogValve) tomcatContainer.getEngineValves().iterator().next())
|
||||
.getFileDateFormat()).isEqualTo(".yyyy-MM-dd");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void tomcatAccessLogFileDateFormatCanBeRedefined() {
|
||||
TomcatEmbeddedServletContainerFactory tomcatContainer = new TomcatEmbeddedServletContainerFactory();
|
||||
Map<String, String> map = new HashMap<String, String>();
|
||||
map.put("server.tomcat.accesslog.enabled", "true");
|
||||
map.put("server.tomcat.accesslog.file-date-format", "yyyy-MM-dd.HH");
|
||||
bindProperties(map);
|
||||
this.properties.customize(tomcatContainer);
|
||||
assertThat(((AccessLogValve) tomcatContainer.getEngineValves().iterator().next())
|
||||
.getFileDateFormat()).isEqualTo("yyyy-MM-dd.HH");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void tomcatAccessLogIsBufferedByDefault() {
|
||||
TomcatEmbeddedServletContainerFactory tomcatContainer = new TomcatEmbeddedServletContainerFactory();
|
||||
|
|
|
@ -196,6 +196,7 @@ content into your application; rather pick only the properties that you need.
|
|||
server.tomcat.accesslog.buffered=true # Buffer output such that it is only flushed periodically.
|
||||
server.tomcat.accesslog.directory=logs # Directory in which log files are created. Can be relative to the tomcat base dir or absolute.
|
||||
server.tomcat.accesslog.enabled=false # Enable access log.
|
||||
server.tomcat.accesslog.file-date-format=.yyyy-MM-dd # Date format to place in log file name.
|
||||
server.tomcat.accesslog.pattern=common # Format pattern for access logs.
|
||||
server.tomcat.accesslog.prefix=access_log # Log file name prefix.
|
||||
server.tomcat.accesslog.rename-on-rotate=false # Defer inclusion of the date stamp in the file name until rotate time.
|
||||
|
|
Loading…
Reference in New Issue