This commit is contained in:
2023-08-18 21:38:57 +08:00
parent 70600c83da
commit ad68daaac7
-11
View File
@@ -20,11 +20,8 @@ use Kiri\Router\HttpRequestHandler;
use Kiri\Router\Interface\ExceptionHandlerInterface; use Kiri\Router\Interface\ExceptionHandlerInterface;
use Kiri\Router\Interface\OnRequestInterface; use Kiri\Router\Interface\OnRequestInterface;
use Kiri\Router\RouterCollector; use Kiri\Router\RouterCollector;
use Monolog\Logger;
use Psr\Http\Message\RequestInterface; use Psr\Http\Message\RequestInterface;
use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\UriInterface;
use Psr\Log\LoggerInterface;
use Swoole\Http\Request; use Swoole\Http\Request;
use Swoole\Http\Response; use Swoole\Http\Response;
use Kiri\Router\Base\Middleware as MiddlewareManager; use Kiri\Router\Base\Middleware as MiddlewareManager;
@@ -41,13 +38,6 @@ class OnRequest implements OnRequestInterface
public RouterCollector $router; public RouterCollector $router;
/**
* @var Logger
*/
#[Container(LoggerInterface::class)]
public Logger $logger;
/** /**
* @var ExceptionHandlerInterface * @var ExceptionHandlerInterface
*/ */
@@ -113,7 +103,6 @@ class OnRequest implements OnRequestInterface
$PsrResponse = (new HttpRequestHandler($middleware, $dispatcher))->handle($PsrRequest); $PsrResponse = (new HttpRequestHandler($middleware, $dispatcher))->handle($PsrRequest);
} catch (\Throwable $throwable) { } catch (\Throwable $throwable) {
$this->logger->failure($throwable);
$PsrResponse = $this->exception->emit($throwable, di(ConstrictResponse::class)); $PsrResponse = $this->exception->emit($throwable, di(ConstrictResponse::class));
} finally { } finally {
$this->emitter->sender($PsrResponse, $response); $this->emitter->sender($PsrResponse, $response);