From 4fe44c5263ad058233148aa18f7c25fedee8997b Mon Sep 17 00:00:00 2001
From: fakeshadow <24548779@qq.com>
Date: Fri, 2 Apr 2021 02:58:55 +0800
Subject: [PATCH] Do not do double check on connection num when entering
 graceful shutdown

---
 actix-server/src/worker.rs | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/actix-server/src/worker.rs b/actix-server/src/worker.rs
index 63c45757..6ebac717 100644
--- a/actix-server/src/worker.rs
+++ b/actix-server/src/worker.rs
@@ -356,18 +356,12 @@ impl Future for ServerWorker {
                 return Poll::Ready(());
             } else if graceful {
                 self.shutdown(false);
-                let num = num_connections();
-                if num != 0 {
-                    info!("Graceful worker shutdown, {} connections", num);
-                    self.state = WorkerState::Shutdown(
-                        Box::pin(sleep(Duration::from_secs(1))),
-                        Box::pin(sleep(self.config.shutdown_timeout)),
-                        Some(result),
-                    );
-                } else {
-                    let _ = result.send(true);
-                    return Poll::Ready(());
-                }
+                info!("Graceful worker shutdown, {} connections", num);
+                self.state = WorkerState::Shutdown(
+                    Box::pin(sleep(Duration::from_secs(1))),
+                    Box::pin(sleep(self.config.shutdown_timeout)),
+                    Some(result),
+                );
             } else {
                 info!("Force shutdown worker, {} connections", num);
                 self.shutdown(true);