From 92f09ae5fa49f91392bd6eac27f07fe8c23a9d79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mr=C2=B7x?= Date: Tue, 2 Mar 2021 13:59:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HttpServer/Events/OnWorkerStart.php | 4 ++++ HttpServer/Server.php | 13 ------------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/HttpServer/Events/OnWorkerStart.php b/HttpServer/Events/OnWorkerStart.php index 6e63e9e8..88452c0e 100644 --- a/HttpServer/Events/OnWorkerStart.php +++ b/HttpServer/Events/OnWorkerStart.php @@ -26,6 +26,8 @@ class OnWorkerStart extends Callback /** @var int 重启信号 */ private int $signal = SIGUSR1 | SIGUSR2 | SIGKILL | SIGTERM; + private int $hook = SWOOLE_HOOK_ALL | SWOOLE_HOOK_CURL | ~SWOOLE_HOOK_BLOCKING_FUNCTION; + /** * @param Server $server @@ -39,6 +41,8 @@ class OnWorkerStart extends Callback { putenv('worker=' . $worker_id); + Runtime::enableCoroutine(true, $this->hook); + Coroutine::set(['enable_deadlock_check' => false]); if ($worker_id >= $server->setting['worker_num']) { diff --git a/HttpServer/Server.php b/HttpServer/Server.php index b5f8b97a..08b94ac9 100644 --- a/HttpServer/Server.php +++ b/HttpServer/Server.php @@ -144,8 +144,6 @@ class Server extends HttpService return 'ok'; } - $this->enableCoroutine(); - return $baseServer->start(); } @@ -205,17 +203,6 @@ class Server extends HttpService } - /** - * @param bool $isEnable - */ - private function enableCoroutine($isEnable = true) - { - if ($isEnable === true) { - Runtime::enableCoroutine(true, SWOOLE_HOOK_ALL | SWOOLE_HOOK_CURL); - } - } - - /** * @throws ConfigException * @throws Exception