diff --git a/typo3/sysext/frontend/Classes/Middleware/TypoScriptFrontendInitialization.php b/typo3/sysext/frontend/Classes/Middleware/TypoScriptFrontendInitialization.php index 50850103be18f4f842b6bdcef6c7eb439a2d58f1..55fba5f71d0a7bedb9839f5d54f73ba3133b99fc 100644 --- a/typo3/sysext/frontend/Classes/Middleware/TypoScriptFrontendInitialization.php +++ b/typo3/sysext/frontend/Classes/Middleware/TypoScriptFrontendInitialization.php @@ -15,17 +15,11 @@ namespace TYPO3\CMS\Frontend\Middleware; * The TYPO3 project - inspiring people to share! */ -use Doctrine\DBAL\Exception\ConnectionException; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Server\MiddlewareInterface; use Psr\Http\Server\RequestHandlerInterface; -use Psr\Log\LoggerAwareInterface; -use Psr\Log\LoggerAwareTrait; -use TYPO3\CMS\Core\Database\ConnectionPool; -use TYPO3\CMS\Core\Error\Http\ServiceUnavailableException; use TYPO3\CMS\Core\Utility\GeneralUtility; -use TYPO3\CMS\Frontend\Controller\ErrorController; use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController; /** @@ -34,13 +28,10 @@ use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController; * * @internal this middleware might get removed in TYPO3 v10.0. */ -class TypoScriptFrontendInitialization implements MiddlewareInterface, LoggerAwareInterface +class TypoScriptFrontendInitialization implements MiddlewareInterface { - use LoggerAwareTrait; - /** - * Creates an instance of TSFE and sets it as a global variable, - * also pings the database in order ensure a valid database connection. + * Creates an instance of TSFE and sets it as a global variable. * * @param ServerRequestInterface $request * @param RequestHandlerInterface $handler @@ -61,20 +52,6 @@ class TypoScriptFrontendInitialization implements MiddlewareInterface, LoggerAwa if ($request->getParsedBody()['no_cache'] ?? $request->getQueryParams()['no_cache'] ?? false) { $GLOBALS['TSFE']->set_no_cache('&no_cache=1 has been supplied, so caching is disabled! URL: "' . (string)$request->getUri() . '"'); } - - // Set up the database connection and see if the connection can be established - try { - $connection = GeneralUtility::makeInstance(ConnectionPool::class)->getConnectionForTable('pages'); - $connection->connect(); - } catch (ConnectionException | \RuntimeException $exception) { - $message = 'Cannot connect to the configured database'; - $this->logger->emergency($message, ['exception' => $exception]); - try { - return GeneralUtility::makeInstance(ErrorController::class)->unavailableAction($request, $message); - } catch (ServiceUnavailableException $e) { - throw new ServiceUnavailableException($message, 1526013723); - } - } return $handler->handle($request); } }