.../EventSubscriber/MaintenanceModeSubscriber.php | 13 ++- .../serialization/serialization.services.yml | 7 -- .../EventSubscriber/MaintenanceModeSubscriber.php | 112 --------------------- 3 files changed, 12 insertions(+), 120 deletions(-) diff --git a/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php index 7e894be..07ec09b 100644 --- a/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php +++ b/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php @@ -13,6 +13,7 @@ use Drupal\Core\StringTranslation\StringTranslationTrait; use Drupal\Core\StringTranslation\TranslationInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface; +use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Event\GetResponseEvent; use Symfony\Component\HttpKernel\KernelEvents; @@ -92,9 +93,19 @@ public function __construct(MaintenanceModeInterface $maintenance_mode, ConfigFa public function onKernelRequestMaintenance(GetResponseEvent $event) { $request = $event->getRequest(); $route_match = RouteMatch::createFromRequest($request); - if ($request->getRequestFormat() === 'html' && $this->maintenanceMode->applies($route_match)) { + if ($this->maintenanceMode->applies($route_match)) { // Don't cache maintenance mode pages. \Drupal::service('page_cache_kill_switch')->trigger(); + + if ($request->getRequestFormat() !== 'html') { + $message = SafeMarkup::format($this->config->get('system.maintenance')->get('message'), array( + '@site' => $this->config->get('system.site')->get('name'), + ); + $response = new Response($message, 503, array('Content-Type' => 'text/plain')); + $event->setResponse($response); + return; + } + if (!$this->maintenanceMode->exempt($this->account)) { // Deliver the 503 page if the site is in maintenance mode and the // logged in user is not allowed to bypass it. diff --git a/core/modules/serialization/serialization.services.yml b/core/modules/serialization/serialization.services.yml index e63e731..c510ab1 100644 --- a/core/modules/serialization/serialization.services.yml +++ b/core/modules/serialization/serialization.services.yml @@ -64,10 +64,3 @@ services: class: Drupal\serialization\EntityResolver\TargetIdResolver tags: - { name: entity_resolver} - - serialization.maintenance_mode_subscriber: - class: Drupal\serialization\EventSubscriber\MaintenanceModeSubscriber - arguments: ['@maintenance_mode', '@config.factory', '@current_user', '@serializer', '%serializer.formats%'] - tags: - - { name: event_subscriber } - diff --git a/core/modules/serialization/src/EventSubscriber/MaintenanceModeSubscriber.php b/core/modules/serialization/src/EventSubscriber/MaintenanceModeSubscriber.php deleted file mode 100644 index f280b1f..0000000 --- a/core/modules/serialization/src/EventSubscriber/MaintenanceModeSubscriber.php +++ /dev/null @@ -1,112 +0,0 @@ -maintenanceMode = $maintenance_mode; - $this->config = $config_factory; - $this->account = $account; - $this->serializer = $serializer; - $this->serializationFormats = $serializer_formats; - } - - /** - * Returns a maintenance response if the site is offline. - * - * @param \Symfony\Component\HttpKernel\Event\GetResponseEvent $event - * The event to process. - */ - public function onKernelRequestMaintenance(GetResponseEvent $event) { - $request = $event->getRequest(); - $request_format = $request->getRequestFormat(); - $route_match = RouteMatch::createFromRequest($request); - if (in_array($request_format, $this->serializationFormats) && $this->maintenanceMode->applies($route_match)) { - // Don't cache maintenance mode pages. - \Drupal::service('page_cache_kill_switch')->trigger(); - if (!$this->maintenanceMode->exempt($this->account)) { - // Deliver a 503 response if the site is in maintenance mode and the - // logged in user is not allowed to bypass it. - $message = Xss::filterAdmin(SafeMarkup::format($this->config->get('system.maintenance')->get('message'), [ - '@site' => $this->config->get('system.site')->get('name'), - ])); - $response = new Response($this->serializer->serialize($message, $request->getRequestFormat()), 503, ['Content-Type' => $request->getMimeType($request_format)]); - $event->setResponse($response); - } - } - } - - /** - * {@inheritdoc} - */ - public static function getSubscribedEvents() { - $events[KernelEvents::REQUEST][] = ['onKernelRequestMaintenance', 30]; - return $events; - } - -}