Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish contribution

Browse Source 
Closes gh-15054
This commit is contained in:
Stephane Nicoll
2018-12-03 11:13:40 +01:00
parent 3059f0e2e2
commit 1b40b0edf1
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizer.java
View File

@@ -136,6 +136,13 @@ public class TomcatWebServerFactoryCustomizer implements
}); });
} }
private void customizeProcessorCache(ConfigurableTomcatWebServerFactory factory,
int processorCache) {
factory.addConnectorCustomizers((
connector) -> ((AbstractHttp11Protocol<?>) connector.getProtocolHandler())
.setProcessorCache(processorCache));
}
private void customizeMaxConnections(ConfigurableTomcatWebServerFactory factory, private void customizeMaxConnections(ConfigurableTomcatWebServerFactory factory,
int maxConnections) { int maxConnections) {
factory.addConnectorCustomizers((connector) -> { factory.addConnectorCustomizers((connector) -> {
@@ -158,13 +165,6 @@ public class TomcatWebServerFactoryCustomizer implements
}); });
} }
private void customizeProcessorCache(ConfigurableTomcatWebServerFactory factory,
int processorCache) {
factory.addConnectorCustomizers((
connector) -> ((AbstractHttp11Protocol<?>) connector.getProtocolHandler())
.setProcessorCache(processorCache));
}
private void customizeRemoteIpValve(ConfigurableTomcatWebServerFactory factory) { private void customizeRemoteIpValve(ConfigurableTomcatWebServerFactory factory) {
Tomcat tomcatProperties = this.serverProperties.getTomcat(); Tomcat tomcatProperties = this.serverProperties.getTomcat();
String protocolHeader = tomcatProperties.getProtocolHeader(); String protocolHeader = tomcatProperties.getProtocolHeader();

6
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ServerPropertiesTests.java
View File

@@ -206,6 +206,12 @@ public class ServerPropertiesTests {
.isEqualTo(getDefaultProtocol().getAcceptCount()); .isEqualTo(getDefaultProtocol().getAcceptCount());
} }
@Test
public void tomcatProcessorCacheMatchesProtocolDefault() throws Exception {
assertThat(this.properties.getTomcat().getProcessorCache())
.isEqualTo(getDefaultProtocol().getProcessorCache());
}
@Test @Test
public void tomcatMaxConnectionsMatchesProtocolDefault() throws Exception { public void tomcatMaxConnectionsMatchesProtocolDefault() throws Exception {
assertThat(this.properties.getTomcat().getMaxConnections()) assertThat(this.properties.getTomcat().getMaxConnections())

2
spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
View File

@@ -276,7 +276,7 @@ content into your application. Rather, pick only the properties that you need.
server.tomcat.max-threads=200 # Maximum amount of worker threads. server.tomcat.max-threads=200 # Maximum amount of worker threads.
server.tomcat.min-spare-threads=10 # Minimum amount of worker threads. server.tomcat.min-spare-threads=10 # Minimum amount of worker threads.
server.tomcat.port-header=X-Forwarded-Port # Name of the HTTP header used to override the original port value. server.tomcat.port-header=X-Forwarded-Port # Name of the HTTP header used to override the original port value.
server.tomcat.processor-cache= # Maximum number of idle processors that will be retained in the cache and reused with a subsequent request. server.tomcat.processor-cache=200 # Maximum number of idle processors that will be retained in the cache and reused with a subsequent request.
server.tomcat.protocol-header= # Header that holds the incoming protocol, usually named "X-Forwarded-Proto". server.tomcat.protocol-header= # Header that holds the incoming protocol, usually named "X-Forwarded-Proto".
server.tomcat.protocol-header-https-value=https # Value of the protocol header indicating whether the incoming request uses SSL. server.tomcat.protocol-header-https-value=https # Value of the protocol header indicating whether the incoming request uses SSL.
server.tomcat.redirect-context-root=true # Whether requests to the context root should be redirected by appending a / to the path. server.tomcat.redirect-context-root=true # Whether requests to the context root should be redirected by appending a / to the path.