From 5824d5626bf81a9e1786d4fc584d2f5cfd530567 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mr=C2=B7x?= <as2252258@163.com>
Date: Tue, 16 Mar 2021 14:45:37 +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, 11 insertions(+), 11 deletions(-)

diff --git a/HttpServer/Events/OnRequest.php b/HttpServer/Events/OnRequest.php
index 4ba38445..dd77b54e 100644
--- a/HttpServer/Events/OnRequest.php
+++ b/HttpServer/Events/OnRequest.php
@@ -36,11 +36,11 @@ class OnRequest extends Callback
 	/**
 	 * @throws Exception
 	 */
-	public function init()
-	{
-		$this->event = Snowflake::app()->getEvent();
-		$this->logger = Snowflake::app()->getLogger();
-	}
+//	public function init()
+//	{
+////		$this->event = Snowflake::app()->getEvent();
+//		$this->logger = Snowflake::app()->getLogger();
+//	}
 
 
 	const BEFORE_REQUEST = 'beforeRequest';
@@ -59,18 +59,18 @@ class OnRequest extends Callback
 			/** @var HRequest $request */
 			[$request, $response] = OnRequest::createContext($request, $response);
 
-			$this->event->dispatch(self::BEFORE_REQUEST, [$request]);
+//			$this->event->dispatch(Event::EVENT_BEFORE_REQUEST, [$request]);
 
 			$result = $request->dispatch();
 
-			$this->event->dispatch(self::AFTER_REQUEST, [$request, $result]);
+//			$this->event->dispatch(Event::EVENT_AFTER_REQUEST, [$request, $result]);
 
 			return $result;
 		} catch (ExitException | Error | \Throwable $exception) {
 			return $this->sendErrorMessage($request, $response, $exception);
 		} finally {
-			$this->event->trigger(Event::SYSTEM_RESOURCE_RELEASES);
-			$this->logger->insert();
+			file(Event::SYSTEM_RESOURCE_RELEASES);
+			\logger()->insert();
 		}
 	}
 
@@ -98,12 +98,12 @@ class OnRequest extends Callback
 	protected function sendErrorMessage($sRequest, $sResponse, $exception): bool|string
 	{
 		$this->error($exception->getMessage());
-		$this->event->dispatch(self::AFTER_REQUEST, [$sRequest, $exception]);
-
 		if ($sResponse instanceof Response) {
 			[$sRequest, $sResponse] = [HRequest::create($sRequest), HResponse::create($sResponse)];
 		}
 
+//		$this->event->dispatch(Event::EVENT_AFTER_REQUEST, [$sRequest, $exception]);
+
 		$headers = $sRequest->headers->get('access-control-request-headers');
 		$methods = $sRequest->headers->get('access-control-request-method');