From faaf9f45117d4b1046896bc6ea30eaa472752e99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mr=C2=B7x?= <as2252258@163.com>
Date: Wed, 2 Dec 2020 11:36:45 +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/Events/OnRequest.php | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/HttpServer/Events/OnRequest.php b/HttpServer/Events/OnRequest.php
index 37cbcabb..caa00d88 100644
--- a/HttpServer/Events/OnRequest.php
+++ b/HttpServer/Events/OnRequest.php
@@ -47,6 +47,7 @@ class OnRequest extends Callback
 	/**
 	 * @param Request $request
 	 * @param Response $response
+	 * @return false|int|mixed|string|void
 	 * @throws Exception
 	 */
 	public function onRequest(Request $request, Response $response)
@@ -55,12 +56,14 @@ class OnRequest extends Callback
 			/** @var HRequest $sRequest */
 			[$sRequest, $sResponse] = [HRequest::create($request), HResponse::create($response)];
 			if ($sRequest->is('favicon.ico')) {
-				$sResponse->send($sRequest->isNotFound(), 200);
-			} else {
-				Snowflake::app()->getRouter()->dispatch();
+				return $sResponse->send($sRequest->isNotFound(), 200);
 			}
+			return Snowflake::app()->getRouter()->dispatch();
 		} catch (Error | \Throwable $exception) {
-			$this->sendErrorMessage($sResponse ?? null, $exception, $response);
+			return $this->sendErrorMessage($exception);
+		} finally {
+			$logger = Snowflake::app()->getLogger();
+			$logger->write(JSON::encode($request), 'request');
 		}
 	}
 
@@ -94,20 +97,15 @@ class OnRequest extends Callback
 	}
 
 	/**
-	 * @param $sResponse
 	 * @param $exception
-	 * @param $response
 	 * @return false|int|mixed|string
+	 * @throws ComponentException
 	 * @throws Exception
 	 */
-	protected function sendErrorMessage($sResponse, $exception, $response)
+	protected function sendErrorMessage($exception)
 	{
 		$params = Snowflake::app()->getLogger()->exception($exception);
-		if (empty($sResponse)) {
-			$sResponse = \response();
-			$sResponse->response = $response;
-		}
-		return $sResponse->send($params, 200);
+		return \response()->send($params, 200);
 	}
 
 }