as2252258/kiri-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

改名

Browse Source
This commit is contained in:
Mr·x
2021-03-03 14:18:03 +08:00
parent 33ec995784
commit 50951af5cc
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HttpServer/Events/OnHandshake.php
+1 -4
View File
@@ -8,11 +8,8 @@ use Annotation\Route\Socket;
use Exception; use Exception;
use HttpServer\Abstracts\Callback; use HttpServer\Abstracts\Callback;
use HttpServer\Http\Request; use HttpServer\Http\Request;
use Snowflake\Abstracts\Config;
use Snowflake\Event; use Snowflake\Event;
use Snowflake\Exception\ComponentException;
use Snowflake\Snowflake; use Snowflake\Snowflake;
use Swoole\Coroutine;
use Swoole\Http\Request as SRequest; use Swoole\Http\Request as SRequest;
use Swoole\Http\Response as SResponse; use Swoole\Http\Response as SResponse;
use Swoole\WebSocket\Server; use Swoole\WebSocket\Server;
@@ -113,7 +110,7 @@ class OnHandshake extends Callback
$sRequest->uri = '/' . Socket::HANDSHAKE . '::event'; $sRequest->uri = '/' . Socket::HANDSHAKE . '::event';
$sRequest->headers->replace('request_method', 'sw::socket'); $sRequest->headers->replace('request_method', 'sw::socket');
$sRequest->headers->replace('request_uri', $sRequest->uri); $sRequest->headers->replace('request_uri', $sRequest->uri);
$sRequest->parseUri();; $sRequest->parseUri();
if (($node = $router->find_path($sRequest)) === null) { if (($node = $router->find_path($sRequest)) === null) {
return $this->disconnect($response, 502); return $this->disconnect($response, 502);
HttpServer/Events/OnMessage.php
+3 -4
View File
@@ -38,10 +38,6 @@ class OnMessage extends Callback
public function onHandler(Server $server, Frame $frame) public function onHandler(Server $server, Frame $frame)
{ {
try { try {
Coroutine::defer(function () {
fire(Event::SYSTEM_RESOURCE_RELEASES);
Snowflake::app()->getLogger()->insert();
});
if ($frame->opcode == 0x08) { if ($frame->opcode == 0x08) {
return; return;
} }
@@ -53,6 +49,9 @@ class OnMessage extends Callback
} catch (\Throwable $exception) { } catch (\Throwable $exception) {
$this->addError($exception, 'websocket'); $this->addError($exception, 'websocket');
$server->send($frame->fd, $exception->getMessage()); $server->send($frame->fd, $exception->getMessage());
} finally {
fire(Event::SYSTEM_RESOURCE_RELEASES);
logger()->insert();
} }
} }