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

Use Duration for ServerProperties.Jetty.idleTimeout

Browse Source 
See gh-18206
This commit is contained in:
Johnny Lim
2019-09-11 19:03:13 +09:00
committed by Stephane Nicoll
parent d86c72bf73
commit 96019362f7
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java
View File

@@ -919,7 +919,7 @@ public class ServerProperties {
/**
* Maximum thread idle time.
*/
private Integer idleTimeout = 60000;
private Duration idleTimeout = Duration.ofMillis(60000);
public Accesslog getAccesslog() {
return this.accesslog;
@@ -965,11 +965,11 @@ public class ServerProperties {
return this.maxThreads;
}
public void setIdleTimeout(Integer idleTimeout) {
public void setIdleTimeout(Duration idleTimeout) {
this.idleTimeout = idleTimeout;
}
public Integer getIdleTimeout() {
public Duration getIdleTimeout() {
return this.idleTimeout;
}

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

@@ -86,8 +86,9 @@ public class JettyWebServerFactoryCustomizer
.to((maxThreads) -> customizeThreadPool(factory, (threadPool) -> threadPool.setMaxThreads(maxThreads)));
propertyMapper.from(jettyProperties::getMinThreads).when(this::isPositive)
.to((minThreads) -> customizeThreadPool(factory, (threadPool) -> threadPool.setMinThreads(minThreads)));
propertyMapper.from(jettyProperties::getIdleTimeout).when(this::isPositive).to(
(idleTimeout) -> customizeThreadPool(factory, (threadPool) -> threadPool.setIdleTimeout(idleTimeout)));
propertyMapper.from(jettyProperties::getIdleTimeout).whenNonNull()
.to((idleTimeout) -> customizeThreadPool(factory,
(threadPool) -> threadPool.setIdleTimeout((int) idleTimeout.toMillis())));
propertyMapper.from(properties::getConnectionTimeout).whenNonNull()
.to((connectionTimeout) -> customizeConnectionTimeout(factory, connectionTimeout));
propertyMapper.from(jettyProperties::getAccesslog).when(ServerProperties.Jetty.Accesslog::isEnabled)

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

@@ -233,8 +233,8 @@ class ServerPropertiesTests {
@Test
void testCustomizeJettyIdleTimeout() {
bind("server.jetty.idle-timeout", "10");
assertThat(this.properties.getJetty().getIdleTimeout()).isEqualTo(10);
bind("server.jetty.idle-timeout", "10s");
assertThat(this.properties.getJetty().getIdleTimeout()).isEqualTo(Duration.ofSeconds(10));
}
@Test

4
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/JettyWebServerFactoryCustomizerTests.java
View File

@@ -132,10 +132,10 @@ class JettyWebServerFactoryCustomizerTests {
@Test
void idleTimeoutCanBeCustomized() {
bind("server.jetty.idle-timeout=100");
bind("server.jetty.idle-timeout=100s");
JettyWebServer server = customizeAndGetServer();
QueuedThreadPool threadPool = (QueuedThreadPool) server.getServer().getThreadPool();
assertThat(threadPool.getIdleTimeout()).isEqualTo(100);
assertThat(threadPool.getIdleTimeout()).isEqualTo(100000);
}
private CustomRequestLog getRequestLog(JettyWebServer server) {