diff --git a/HttpServer/Events/OnHandshake.php b/HttpServer/Events/OnHandshake.php index ed66c193..861259eb 100644 --- a/HttpServer/Events/OnHandshake.php +++ b/HttpServer/Events/OnHandshake.php @@ -8,11 +8,8 @@ use Annotation\Route\Socket; use Exception; use HttpServer\Abstracts\Callback; use HttpServer\Http\Request; -use Snowflake\Abstracts\Config; use Snowflake\Event; -use Snowflake\Exception\ComponentException; use Snowflake\Snowflake; -use Swoole\Coroutine; use Swoole\Http\Request as SRequest; use Swoole\Http\Response as SResponse; use Swoole\WebSocket\Server; @@ -113,7 +110,7 @@ class OnHandshake extends Callback $sRequest->uri = '/' . Socket::HANDSHAKE . '::event'; $sRequest->headers->replace('request_method', 'sw::socket'); $sRequest->headers->replace('request_uri', $sRequest->uri); - $sRequest->parseUri();; + $sRequest->parseUri(); if (($node = $router->find_path($sRequest)) === null) { return $this->disconnect($response, 502); diff --git a/HttpServer/Events/OnMessage.php b/HttpServer/Events/OnMessage.php index 16ab3623..fc6a46a6 100644 --- a/HttpServer/Events/OnMessage.php +++ b/HttpServer/Events/OnMessage.php @@ -38,10 +38,6 @@ class OnMessage extends Callback public function onHandler(Server $server, Frame $frame) { try { - Coroutine::defer(function () { - fire(Event::SYSTEM_RESOURCE_RELEASES); - Snowflake::app()->getLogger()->insert(); - }); if ($frame->opcode == 0x08) { return; } @@ -53,6 +49,9 @@ class OnMessage extends Callback } catch (\Throwable $exception) { $this->addError($exception, 'websocket'); $server->send($frame->fd, $exception->getMessage()); + } finally { + fire(Event::SYSTEM_RESOURCE_RELEASES); + logger()->insert(); } }