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-02-25 14:53:55 +08:00
parent 1e457b08d8
commit 62a626aec3
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HttpServer/Events/OnRequest.php
+5 -7
View File
@@ -40,12 +40,11 @@ class OnRequest extends Callback
fire(Event::SYSTEM_RESOURCE_RELEASES); fire(Event::SYSTEM_RESOURCE_RELEASES);
}); });
[$request, $response] = static::create($request, $response); [$request, $response] = static::create($request, $response);
if ($request->is('favicon.ico')) { if (!$request->is('favicon.ico')) {
return \send(null, 404); return \router()->dispatch();
} }
return \router()->dispatch(); return \send(null);
} catch (ExitException | Error | \Throwable $exception) { } catch (ExitException | Error | \Throwable $exception) {
$this->addError($exception);
if ($exception instanceof ExitException) { if ($exception instanceof ExitException) {
return \send($exception->getMessage(), $exception->getCode()); return \send($exception->getMessage(), $exception->getCode());
} }
@@ -77,11 +76,10 @@ class OnRequest extends Callback
*/ */
protected function sendErrorMessage($sRequest, $sResponse, $exception): bool|string protected function sendErrorMessage($sRequest, $sResponse, $exception): bool|string
{ {
$this->error($exception);
$params = Snowflake::app()->getLogger()->exception($exception); $params = Snowflake::app()->getLogger()->exception($exception);
if ($sResponse instanceof Response) { if ($sResponse instanceof Response) {
$sResponse->header('Access-Control-Allow-Origin', '*'); [$sRequest, $sResponse] = [HRequest::create($sRequest), HResponse::create($sResponse)];
$sResponse->status(200);
return $sResponse->end($params);
} }
$sResponse->addHeader('Access-Control-Allow-Origin', '*'); $sResponse->addHeader('Access-Control-Allow-Origin', '*');