From 7ae222268ea848c624d92122d3b4aac5926e4f13 Mon Sep 17 00:00:00 2001
From: "as2252258@163.com" <as22522582>
Date: Mon, 6 Sep 2021 02:21:56 +0800
Subject: [PATCH] 111

---
 core/Pool/Pool.php                    | 8 +++-----
 http-server/Worker/OnServerWorker.php | 4 ++--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/core/Pool/Pool.php b/core/Pool/Pool.php
index 54106871..f62091a4 100644
--- a/core/Pool/Pool.php
+++ b/core/Pool/Pool.php
@@ -48,11 +48,9 @@ class Pool extends Component
     protected function pop(Channel $channel, $retain_number): void
     {
         while ($channel->length() > $retain_number) {
-            if (Context::inCoroutine()) {
-                $connection = $channel->pop();
-                if ($connection instanceof StopHeartbeatCheck) {
-                    $connection->stopHeartbeatCheck();
-                }
+            $connection = $channel->pop();
+            if ($connection instanceof StopHeartbeatCheck) {
+                $connection->stopHeartbeatCheck();
             }
         }
     }
diff --git a/http-server/Worker/OnServerWorker.php b/http-server/Worker/OnServerWorker.php
index a275c7b6..72fa9c8f 100644
--- a/http-server/Worker/OnServerWorker.php
+++ b/http-server/Worker/OnServerWorker.php
@@ -83,9 +83,9 @@ class OnServerWorker extends \Server\Abstracts\Server
      */
     public function onWorkerExit(Server $server, int $workerId)
     {
-        $this->eventDispatch->dispatch(new OnWorkerExit($server, $workerId));
-
         ServerManager::setEnv('state', 'exit');
+
+        $this->eventDispatch->dispatch(new OnWorkerExit($server, $workerId));
     }