Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/DependencyInjection/Configuration.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
use Overblog\GraphQLBundle\Error\ErrorHandler;
use Overblog\GraphQLBundle\EventListener\ErrorLoggerListener;
use Overblog\GraphQLBundle\Resolver\Resolver;
use Psr\Log\LogLevel;
use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
use Symfony\Component\Config\Definition\Builder\EnumNodeDefinition;
use Symfony\Component\Config\Definition\Builder\ScalarNodeDefinition;
Expand Down Expand Up @@ -86,6 +87,7 @@ private function errorsHandlerSection()
->booleanNode('log')->defaultTrue()->end()
->scalarNode('logger_service')->defaultValue(ErrorLoggerListener::DEFAULT_LOGGER_SERVICE)->end()
->booleanNode('map_exceptions_to_parent')->defaultFalse()->end()
->scalarNode('log_level')->defaultValue(LogLevel::DEBUG)->end()
->arrayNode('exceptions')
->addDefaultsIfNotSet()
->children()
Expand Down
2 changes: 1 addition & 1 deletion src/DependencyInjection/OverblogGraphQLExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ private function setErrorHandler(array $config, ContainerBuilder $container): vo

$errorHandlerListenerDefinition = $container->setDefinition(ErrorHandlerListener::class, new Definition(ErrorHandlerListener::class));
$errorHandlerListenerDefinition->setPublic(true)
->setArguments([new Reference($id), $config['errors_handler']['rethrow_internal_exceptions'], $config['errors_handler']['debug']])
->setArguments([new Reference($id), new Reference(ErrorHandlerListener::DEFAULT_LOGGER_SERVICE), $config['errors_handler']['rethrow_internal_exceptions'], $config['errors_handler']['debug'], $config['errors_handler']['log_level']])
->addTag('kernel.event_listener', ['event' => Events::POST_EXECUTOR, 'method' => 'onPostExecutor'])
;

Expand Down
27 changes: 25 additions & 2 deletions src/EventListener/ErrorHandlerListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,14 @@

use Overblog\GraphQLBundle\Error\ErrorHandler;
use Overblog\GraphQLBundle\Event\ExecutorResultEvent;
use Psr\Log\LoggerInterface;
use Psr\Log\LogLevel;
use Psr\Log\NullLogger;

final class ErrorHandlerListener
{
public const DEFAULT_LOGGER_SERVICE = 'logger';

/** @var ErrorHandler */
private $errorHandler;

Expand All @@ -18,16 +23,34 @@ final class ErrorHandlerListener
/** @var bool */
private $debug;

public function __construct(ErrorHandler $errorHandler, $throwException = false, $debug = false)
{
/** @var LoggerInterface */
private $logger;

/** @var string */
private $errorLevel;

public function __construct(
ErrorHandler $errorHandler,
LoggerInterface $logger,
bool $throwException = false,
bool $debug = false,
string $errorLevel = LogLevel::DEBUG
) {
$this->errorHandler = $errorHandler;
$this->throwException = $throwException;
$this->debug = $debug;
$this->logger = null === $logger ? new NullLogger() : $logger;
$this->errorLevel = $errorLevel;
}

public function onPostExecutor(ExecutorResultEvent $executorResultEvent): void
{
$result = $executorResultEvent->getResult();
$this->errorHandler->handleErrors($result, $this->throwException, $this->debug);
$result = $result->toArray();

if (isset($result['errors'])) {
$this->logger->{$this->errorLevel}('GraphQL request resulted with an error.', $result['errors']);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
use Overblog\GraphQLBundle\Tests\DependencyInjection\Builder\PagerArgs;
use Overblog\GraphQLBundle\Tests\DependencyInjection\Builder\RawIdField;
use PHPUnit\Framework\TestCase;
use Psr\Log\LogLevel;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\Routing\Exception\ResourceNotFoundException;

Expand Down Expand Up @@ -97,6 +98,7 @@ public function testCustomExceptions(): void
\InvalidArgumentException::class,
],
],
'log_level' => LogLevel::DEBUG,
],
],
],
Expand Down