diff --git a/core/lib/Drupal/Core/EventSubscriber/ExceptionLoggingSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/ExceptionLoggingSubscriber.php index 8adc67a6c969b4e512e3e29b8d25bd77ef81c572..31b45d5e58aa2ed8c1e7df54523d03135fd23588 100644 --- a/core/lib/Drupal/Core/EventSubscriber/ExceptionLoggingSubscriber.php +++ b/core/lib/Drupal/Core/EventSubscriber/ExceptionLoggingSubscriber.php @@ -88,7 +88,7 @@ public function onClientError(ExceptionEvent $event) { 'status_code' => $exception->getStatusCode(), ]; $this->logger->get('client error') - ->log($error['severity_level'], Error::DEFAULT_ERROR_MESSAGE, $error); + ->warning(Error::DEFAULT_ERROR_MESSAGE, $error); } /** diff --git a/core/tests/Drupal/KernelTests/Core/EventSubscriber/ExceptionLoggingSubscriberTest.php b/core/tests/Drupal/KernelTests/Core/EventSubscriber/ExceptionLoggingSubscriberTest.php index b15ecff3f0fee6678689f2519ed90e357583bf57..9bd4d57950565f0c57624b3f5e2eef4315109c5d 100644 --- a/core/tests/Drupal/KernelTests/Core/EventSubscriber/ExceptionLoggingSubscriberTest.php +++ b/core/tests/Drupal/KernelTests/Core/EventSubscriber/ExceptionLoggingSubscriberTest.php @@ -3,6 +3,7 @@ namespace Drupal\KernelTests\Core\EventSubscriber; use Drupal\Core\DependencyInjection\ContainerBuilder; +use Drupal\Core\Logger\RfcLogLevel; use Drupal\KernelTests\KernelTestBase; use Symfony\Component\ErrorHandler\BufferingLogger; use Symfony\Component\HttpFoundation\Request; @@ -47,6 +48,18 @@ public function testExceptionLogging() { 503 => 'php', ]; + $level_map = [ + 400 => RfcLogLevel::WARNING, + 401 => RfcLogLevel::WARNING, + 403 => RfcLogLevel::WARNING, + 404 => RfcLogLevel::WARNING, + 405 => RfcLogLevel::WARNING, + 408 => RfcLogLevel::WARNING, + 501 => RfcLogLevel::ERROR, + 502 => RfcLogLevel::ERROR, + 503 => RfcLogLevel::ERROR, + ]; + // Ensure that noting is logged. $this->assertEmpty($this->container->get($this->testLogServiceName)->cleanLogs()); @@ -60,11 +73,12 @@ public function testExceptionLogging() { ini_set('error_log', $error_log); $expected_channels = array_values($channel_map); + $expected_levels = array_values($level_map); $logs = $this->container->get($this->testLogServiceName)->cleanLogs(); foreach ($expected_channels as $key => $expected_channel) { - $log_message = $logs[$key][2]['channel']; - $this->assertEquals($expected_channel, $log_message); + $this->assertEquals($expected_channel, $logs[$key][2]['channel']); + $this->assertEquals($expected_levels[$key], $logs[$key][0]); } }