This commit is contained in:
2021-03-16 14:46:57 +08:00
parent a890dc3fb8
commit d8dc14f5aa
+10 -14
View File
@@ -36,15 +36,11 @@ class OnRequest extends Callback
/** /**
* @throws Exception * @throws Exception
*/ */
// public function init() public function init()
// { {
//// $this->event = Snowflake::app()->getEvent(); $this->event = Snowflake::app()->getEvent();
// $this->logger = Snowflake::app()->getLogger(); $this->logger = Snowflake::app()->getLogger();
// } }
const BEFORE_REQUEST = 'beforeRequest';
const AFTER_REQUEST = 'afterRequest';
/** /**
@@ -59,18 +55,18 @@ class OnRequest extends Callback
/** @var HRequest $request */ /** @var HRequest $request */
[$request, $response] = OnRequest::createContext($request, $response); [$request, $response] = OnRequest::createContext($request, $response);
// $this->event->dispatch(Event::EVENT_BEFORE_REQUEST, [$request]); $this->event->dispatch(Event::EVENT_BEFORE_REQUEST, [$request]);
$result = $request->dispatch(); $result = $request->dispatch();
// $this->event->dispatch(Event::EVENT_AFTER_REQUEST, [$request, $result]); $this->event->dispatch(Event::EVENT_AFTER_REQUEST, [$request, $result]);
return $result; return $result;
} catch (ExitException | Error | \Throwable $exception) { } catch (ExitException | Error | \Throwable $exception) {
return $this->sendErrorMessage($request, $response, $exception); return $this->sendErrorMessage($request, $response, $exception);
} finally { } finally {
fire(Event::SYSTEM_RESOURCE_RELEASES); $this->event->trigger(Event::SYSTEM_RESOURCE_RELEASES);
\logger()->insert(); $this->logger->insert();
} }
} }
@@ -102,7 +98,7 @@ class OnRequest extends Callback
[$sRequest, $sResponse] = [HRequest::create($sRequest), HResponse::create($sResponse)]; [$sRequest, $sResponse] = [HRequest::create($sRequest), HResponse::create($sResponse)];
} }
// $this->event->dispatch(Event::EVENT_AFTER_REQUEST, [$sRequest, $exception]); $this->event->dispatch(Event::EVENT_AFTER_REQUEST, [$sRequest, $exception]);
$headers = $sRequest->headers->get('access-control-request-headers'); $headers = $sRequest->headers->get('access-control-request-headers');
$methods = $sRequest->headers->get('access-control-request-method'); $methods = $sRequest->headers->get('access-control-request-method');