From 462cc98c4aabfa45c176d383ae7e936a315b2842 Mon Sep 17 00:00:00 2001
From: fakeshadow <24548779@qq.com>
Date: Mon, 5 Apr 2021 23:19:40 +0800
Subject: [PATCH] Fix log issue when restarting worker services

---
 actix-server/src/worker.rs | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/actix-server/src/worker.rs b/actix-server/src/worker.rs
index fac9202e..1dbaeebd 100644
--- a/actix-server/src/worker.rs
+++ b/actix-server/src/worker.rs
@@ -283,7 +283,6 @@ impl ServerWorker {
 
     fn check_readiness(&mut self, cx: &mut Context<'_>) -> Result<bool, (Token, usize)> {
         let mut ready = self.conns.available(cx);
-        let mut failed = None;
         for (idx, srv) in self.services.iter_mut().enumerate() {
             if srv.status == WorkerServiceStatus::Available
                 || srv.status == WorkerServiceStatus::Unavailable
@@ -314,17 +313,14 @@ impl ServerWorker {
                             "Service {:?} readiness check returned error, restarting",
                             self.factories[srv.factory].name(Token(idx))
                         );
-                        failed = Some((Token(idx), srv.factory));
                         srv.status = WorkerServiceStatus::Failed;
+                        return Err((Token(idx), srv.factory));
                     }
                 }
             }
         }
-        if let Some(idx) = failed {
-            Err(idx)
-        } else {
-            Ok(ready)
-        }
+
+        Ok(ready)
     }
 }