root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Wait for up to 30s for access logs to be written during shutdown 

Closes gh-17119
This commit is contained in:
Andy Wilkinson 2019-06-12 12:40:11 +01:00
parent 2833f60344
commit df9a6a0f4f
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,6 +23,7 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.concurrent.TimeUnit;
import io.undertow.Handlers; import io.undertow.Handlers;
import io.undertow.Undertow; import io.undertow.Undertow;
@ -156,10 +157,14 @@ public class UndertowReactiveWebServerFactory extends AbstractReactiveWebServerF
try { try {
accessLogReceiver.close(); accessLogReceiver.close();
worker.shutdown(); worker.shutdown();
worker.awaitTermination(30, TimeUnit.SECONDS);
} }
catch (IOException ex) { catch (IOException ex) {
throw new IllegalStateException(ex); throw new IllegalStateException(ex);
} }
catch (InterruptedException ex) {
Thread.currentThread().interrupt();
}
}; };
} }
catch (IOException ex) { catch (IOException ex) {

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

@ -28,6 +28,7 @@ import java.util.Collections;
import java.util.EventListener; import java.util.EventListener;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import javax.servlet.ServletContainerInitializer; import javax.servlet.ServletContainerInitializer;
import javax.servlet.ServletContext; import javax.servlet.ServletContext;
@ -652,10 +653,14 @@ public class UndertowServletWebServerFactory extends AbstractServletWebServerFac
try { try {
this.accessLogReceiver.close(); this.accessLogReceiver.close();
this.worker.shutdown(); this.worker.shutdown();
this.worker.awaitTermination(30, TimeUnit.SECONDS);
} }
catch (IOException ex) { catch (IOException ex) {
throw new IllegalStateException(ex); throw new IllegalStateException(ex);
} }
catch (InterruptedException ex) {
Thread.currentThread().interrupt();
}
} }
} }