From 8b450ef1f00cf36fc48dcc576d83ba29fde171fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mr=C2=B7x?= Date: Fri, 18 Sep 2020 21:17:44 +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/Abstracts/Callback.php | 14 +++----------- HttpServer/Events/OnAfterReload.php | 3 --- HttpServer/Events/OnBeforeReload.php | 3 --- HttpServer/Events/OnConnect.php | 3 --- HttpServer/Events/OnManagerStart.php | 4 +--- HttpServer/Events/OnManagerStop.php | 4 +--- HttpServer/Events/OnPipeMessage.php | 3 --- HttpServer/Events/OnRequest.php | 3 --- HttpServer/Events/OnShutdown.php | 3 --- HttpServer/Events/OnStart.php | 4 +--- HttpServer/Events/OnWorkerStart.php | 3 --- 11 files changed, 6 insertions(+), 41 deletions(-) diff --git a/HttpServer/Abstracts/Callback.php b/HttpServer/Abstracts/Callback.php index 8a6fe93b..ff2a360d 100644 --- a/HttpServer/Abstracts/Callback.php +++ b/HttpServer/Abstracts/Callback.php @@ -55,27 +55,19 @@ abstract class Callback extends Application /** * @param $message - * @param $event + * @param Event $event + * @throws Exception */ - private function eventNotify($message, $event) + private function eventNotify($message, Event $event) { switch ($message) { case self::EVENT_ERROR: - if (!$event->exists(Event::SERVER_WORKER_ERROR)) { - return; - } $event->trigger(Event::SERVER_WORKER_ERROR); break; case self::EVENT_EXIT: - if (!$event->exists(Event::SERVER_WORKER_EXIT)) { - return; - } $event->trigger(Event::SERVER_WORKER_EXIT); break; case self::EVENT_STOP: - if (!$event->exists(Event::SERVER_WORKER_STOP)) { - return; - } $event->trigger(Event::SERVER_WORKER_STOP); break; } diff --git a/HttpServer/Events/OnAfterReload.php b/HttpServer/Events/OnAfterReload.php index e79817a4..2bc579da 100644 --- a/HttpServer/Events/OnAfterReload.php +++ b/HttpServer/Events/OnAfterReload.php @@ -27,9 +27,6 @@ class OnAfterReload extends Callback public function onHandler(Server $server) { $event = Snowflake::app()->getEvent(); - if (!$event->exists(Event::SERVER_AFTER_RELOAD)) { - return; - } $event->trigger(Event::SERVER_AFTER_RELOAD, [$server]); } diff --git a/HttpServer/Events/OnBeforeReload.php b/HttpServer/Events/OnBeforeReload.php index 43083e70..962a1b67 100644 --- a/HttpServer/Events/OnBeforeReload.php +++ b/HttpServer/Events/OnBeforeReload.php @@ -24,9 +24,6 @@ class OnBeforeReload extends Callback public function onHandler(Server $server) { $event = Snowflake::app()->getEvent(); - if (!$event->exists(Event::SERVER_BEFORE_RELOAD)) { - return; - } $event->trigger(Event::SERVER_BEFORE_RELOAD, [$server]); } diff --git a/HttpServer/Events/OnConnect.php b/HttpServer/Events/OnConnect.php index e7cbcdd8..6233931c 100644 --- a/HttpServer/Events/OnConnect.php +++ b/HttpServer/Events/OnConnect.php @@ -28,9 +28,6 @@ class OnConnect extends Callback public function onHandler(\Swoole\Server $server, int $fd, int $reactorId) { $event = Snowflake::app()->event; - if (!$event->exists(Event::RECEIVE_CONNECTION)) { - return; - } $event->trigger(Event::RECEIVE_CONNECTION, [$server, $fd, $reactorId]); } diff --git a/HttpServer/Events/OnManagerStart.php b/HttpServer/Events/OnManagerStart.php index 8b50b352..0c3a6aad 100644 --- a/HttpServer/Events/OnManagerStart.php +++ b/HttpServer/Events/OnManagerStart.php @@ -22,9 +22,7 @@ class OnManagerStart extends Callback Snowflake::setWorkerId($server->manager_pid); $events = Snowflake::app()->event; - if ($events->exists(Event::SERVER_MANAGER_START)) { - $events->trigger(Event::SERVER_MANAGER_START, null, $server); - } + $events->trigger(Event::SERVER_MANAGER_START, null, $server); if (Snowflake::isLinux()) { name('Server Manager.'); } diff --git a/HttpServer/Events/OnManagerStop.php b/HttpServer/Events/OnManagerStop.php index 133f0e19..faa7af02 100644 --- a/HttpServer/Events/OnManagerStop.php +++ b/HttpServer/Events/OnManagerStop.php @@ -25,9 +25,7 @@ class OnManagerStop extends Callback $this->warning('manager stop.'); $events = Snowflake::app()->event; - if ($events->exists(Event::SERVER_MANAGER_STOP)) { - $events->trigger(Event::SERVER_MANAGER_STOP, [$server]); - } + $events->trigger(Event::SERVER_MANAGER_STOP, [$server]); // $runPath = storage(null, 'workerIds'); // foreach (glob($runPath . '/*') as $item) { diff --git a/HttpServer/Events/OnPipeMessage.php b/HttpServer/Events/OnPipeMessage.php index 64325df0..3abc3b5b 100644 --- a/HttpServer/Events/OnPipeMessage.php +++ b/HttpServer/Events/OnPipeMessage.php @@ -29,9 +29,6 @@ class OnPipeMessage extends Callback { // TODO: Implement onHandler() method. $events = Snowflake::app()->getEvent(); - if (!$events->exists(Event::PIPE_MESSAGE)) { - return; - } $events->trigger(Event::PIPE_MESSAGE, [$server, $src_worker_id, $message]); } diff --git a/HttpServer/Events/OnRequest.php b/HttpServer/Events/OnRequest.php index 3f980661..48cc7ef1 100644 --- a/HttpServer/Events/OnRequest.php +++ b/HttpServer/Events/OnRequest.php @@ -52,9 +52,6 @@ class OnRequest extends Callback unset($sResponse, $response); Context::deleteId('response'); $events = Snowflake::app()->getEvent(); - if (!$events->exists(Event::EVENT_AFTER_REQUEST)) { - return; - } $events->trigger(Event::EVENT_AFTER_REQUEST, [$sRequest, $params]); } } diff --git a/HttpServer/Events/OnShutdown.php b/HttpServer/Events/OnShutdown.php index 73d5550f..95c35a5a 100644 --- a/HttpServer/Events/OnShutdown.php +++ b/HttpServer/Events/OnShutdown.php @@ -35,9 +35,6 @@ class OnShutdown extends Callback { $this->system_mail('server shutdown~'); $event = Snowflake::app()->getEvent(); - if (!$event->exists(Event::SERVER_SHUTDOWN)) { - return; - } $event->trigger(Event::SERVER_SHUTDOWN); } diff --git a/HttpServer/Events/OnStart.php b/HttpServer/Events/OnStart.php index ff6e6a9b..0e9d03a3 100644 --- a/HttpServer/Events/OnStart.php +++ b/HttpServer/Events/OnStart.php @@ -22,9 +22,7 @@ class OnStart extends Callback Snowflake::setProcessId($server->master_pid); $event = Snowflake::app()->event; - if ($event->exists(Event::SERVER_EVENT_START)) { - $event->trigger(Event::SERVER_EVENT_START, null, $server); - } + $event->trigger(Event::SERVER_EVENT_START, null, $server); if (Snowflake::isLinux()) { name(rtrim(Config::get('id', 'system:'), ':')); diff --git a/HttpServer/Events/OnWorkerStart.php b/HttpServer/Events/OnWorkerStart.php index 0d85b41c..46c76eed 100644 --- a/HttpServer/Events/OnWorkerStart.php +++ b/HttpServer/Events/OnWorkerStart.php @@ -54,9 +54,6 @@ class OnWorkerStart extends Callback try { $this->debug(sprintf('Worker #%d is start.....', $worker_id)); $event = Snowflake::app()->event; - if (!$event->exists(Event::SERVER_WORKER_START)) { - return; - } $event->trigger(Event::SERVER_WORKER_START, [$worker_id]); } catch (\Throwable $exception) { write($exception->getMessage(), 'worker');