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

Polish 

See gh-21481
This commit is contained in:
wonwoo 2020-05-17 15:49:14 +09:00 committed by Andy Wilkinson
parent 38db129146
commit 25723be26f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/netty/GracefulShutdown.java
View File

@ -63,7 +63,7 @@ final class GracefulShutdown {
callback.shutdownComplete(GracefulShutdownResult.IDLE); callback.shutdownComplete(GracefulShutdownResult.IDLE);
} }
catch (Exception ex) { catch (Exception ex) {
logger.info("Graceful shutdown aborted with one or more active requests"); logger.info("Graceful shutdown aborted with one or more requests still active");
callback.shutdownComplete(GracefulShutdownResult.REQUESTS_ACTIVE); callback.shutdownComplete(GracefulShutdownResult.REQUESTS_ACTIVE);
} }
finally { finally {

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

@ -306,7 +306,7 @@ public class UndertowWebServer implements WebServer {
callback.shutdownComplete(GracefulShutdownResult.IMMEDIATE); callback.shutdownComplete(GracefulShutdownResult.IMMEDIATE);
return; return;
} }
logger.info("Commencing graceful shutdown. Wait for active requests to complete"); logger.info("Commencing graceful shutdown. Waiting for active requests to complete");
this.gracefulShutdownCallback.set(callback); this.gracefulShutdownCallback.set(callback);
this.gracefulShutdown.shutdown(); this.gracefulShutdown.shutdown();
this.gracefulShutdown.addShutdownListener((success) -> notifyGracefulCallback(success)); this.gracefulShutdown.addShutdownListener((success) -> notifyGracefulCallback(success));