This commit is contained in:
2020-09-10 11:47:46 +08:00
parent 338db8d219
commit 5f2e1f9cfa
+12 -20
View File
@@ -41,26 +41,7 @@ class OnRequest extends Callback
if ($sRequest->is('favicon.ico')) { if ($sRequest->is('favicon.ico')) {
return $params = $sResponse->send($sRequest->isNotFound(), 200); return $params = $sResponse->send($sRequest->isNotFound(), 200);
} }
register_shutdown_function(function ($response) {
register_shutdown_function(OnRequest::class . '::shutdown', $response);
return $params = Snowflake::app()->getRouter()->dispatch();
} catch (Error | \Throwable $exception) {
$params = $this->sendErrorMessage($sResponse ?? null, $exception, $response);
} finally {
$events = Snowflake::app()->getEvent();
if (!$events->exists(Event::EVENT_AFTER_REQUEST)) {
return;
}
$events->trigger(Event::EVENT_AFTER_REQUEST, [$sRequest, $params]);
}
}
/**
* @param $response
*/
public static function shutdown($response)
{
$error = error_get_last(); $error = error_get_last();
if (!isset($error['type'])) { if (!isset($error['type'])) {
return; return;
@@ -74,6 +55,17 @@ class OnRequest extends Callback
$response->end($error['message']); $response->end($error['message']);
} }
unset($response); unset($response);
}, $response);
return $params = Snowflake::app()->getRouter()->dispatch();
} catch (Error | \Throwable $exception) {
$params = $this->sendErrorMessage($sResponse ?? null, $exception, $response);
} finally {
$events = Snowflake::app()->getEvent();
if (!$events->exists(Event::EVENT_AFTER_REQUEST)) {
return;
}
$events->trigger(Event::EVENT_AFTER_REQUEST, [$sRequest, $params]);
}
} }