From 25723be26f4326682b7c7b51a4f23349d20d0106 Mon Sep 17 00:00:00 2001 From: wonwoo Date: Sun, 17 May 2020 15:49:14 +0900 Subject: [PATCH] Polish See gh-21481 --- .../boot/web/embedded/netty/GracefulShutdown.java | 2 +- .../boot/web/embedded/undertow/UndertowWebServer.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/netty/GracefulShutdown.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/netty/GracefulShutdown.java index d66e1dfd926..c23518cb1fb 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/netty/GracefulShutdown.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/netty/GracefulShutdown.java @@ -63,7 +63,7 @@ final class GracefulShutdown { callback.shutdownComplete(GracefulShutdownResult.IDLE); } 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); } finally { diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowWebServer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowWebServer.java index 387a6a3c7a3..5715f1ea3c6 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowWebServer.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowWebServer.java @@ -306,7 +306,7 @@ public class UndertowWebServer implements WebServer { callback.shutdownComplete(GracefulShutdownResult.IMMEDIATE); 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.gracefulShutdown.shutdown(); this.gracefulShutdown.addShutdownListener((success) -> notifyGracefulCallback(success));