From 8c1e48dc8bf2403e8c16923685715fa151ac236e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mr=C2=B7x?= Date: Wed, 21 Oct 2020 15:09:15 +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/OnManagerStart.php | 9 ++------- HttpServer/Events/OnWorkerStart.php | 4 ++++ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/HttpServer/Events/OnManagerStart.php b/HttpServer/Events/OnManagerStart.php index f59815f4..fd76470e 100644 --- a/HttpServer/Events/OnManagerStart.php +++ b/HttpServer/Events/OnManagerStart.php @@ -28,14 +28,9 @@ class OnManagerStart extends Callback if (Snowflake::isLinux()) { name('Server Manager.'); } - - System::waitSignal(9 | 15, function () use ($server) { + if (System::waitSignal(9 | 15)) { $server->shutdown(); - while ($ret = Process::wait()) { - var_dump($ret); - } - - }); + } } } diff --git a/HttpServer/Events/OnWorkerStart.php b/HttpServer/Events/OnWorkerStart.php index 7d05de3d..74617068 100644 --- a/HttpServer/Events/OnWorkerStart.php +++ b/HttpServer/Events/OnWorkerStart.php @@ -14,6 +14,7 @@ use Snowflake\Error\Logger; use Snowflake\Event; use Snowflake\Exception\ConfigException; use Snowflake\Snowflake; +use Swoole\Coroutine\System; use Swoole\Server; /** @@ -37,6 +38,9 @@ class OnWorkerStart extends Callback if (!empty($get_name) && !Snowflake::isMac()) { swoole_set_process_name($get_name); } + go(function () use ($server) { + System::waitPid($server->master_pid); + }); if ($worker_id >= $server->setting['worker_num']) { return; }