Skip to content

Commit 9553775

Browse files
author
Maksym Novik
committed
GraphQl-220: Implement exception logging.
Removed client errors logging.
1 parent 7f8170c commit 9553775

File tree

4 files changed

+14
-92
lines changed

4 files changed

+14
-92
lines changed

app/etc/graphql/di.xml

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,21 @@
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
99
<preference for="Magento\Framework\GraphQl\Query\ErrorHandlerInterface" type="Magento\Framework\GraphQl\Query\ErrorHandler"/>
10-
<preference for="Magento\Framework\GraphQl\Query\Resolver\LoggerFactoryInterface" type="Magento\Framework\GraphQl\Query\Resolver\LoggerFactory"/>
11-
<virtualType name="GraphQLClientLogger" type="Magento\Framework\Logger\Monolog">
10+
<virtualType name="GraphQlLogger" type="Magento\Framework\Logger\Monolog">
1211
<arguments>
1312
<argument name="handlers" xsi:type="array">
14-
<item name="error" xsi:type="object">GraphQLClientErrorHandler</item>
13+
<item name="error" xsi:type="object">GraphQlErrorHandler</item>
1514
</argument>
1615
</arguments>
1716
</virtualType>
18-
<virtualType name="GraphQLClientErrorHandler" type="Magento\Framework\Logger\Handler\Base">
17+
<virtualType name="GraphQlErrorHandler" type="Magento\Framework\Logger\Handler\Base">
1918
<arguments>
20-
<argument name="fileName" xsi:type="const">Magento\Framework\GraphQl\Query\ErrorHandler::CLIENT_LOG_FILE</argument>
19+
<argument name="fileName" xsi:type="string">var/log/graphql/exception.log</argument>
2120
</arguments>
2221
</virtualType>
23-
<virtualType name="GraphQLServerLogger" type="Magento\Framework\Logger\Monolog">
22+
<type name="Magento\Framework\GraphQl\Query\ErrorHandler">
2423
<arguments>
25-
<argument name="handlers" xsi:type="array">
26-
<item name="error" xsi:type="object">GraphQLServerErrorHandler</item>
27-
</argument>
28-
</arguments>
29-
</virtualType>
30-
<virtualType name="GraphQLServerErrorHandler" type="Magento\Framework\Logger\Handler\Base">
31-
<arguments>
32-
<argument name="fileName" xsi:type="const">Magento\Framework\GraphQl\Query\ErrorHandler::SERVER_LOG_FILE</argument>
24+
<argument name="logger" xsi:type="object">GraphQlLogger</argument>
3325
</arguments>
34-
</virtualType>
26+
</type>
3527
</config>

lib/internal/Magento/Framework/GraphQl/Query/ErrorHandler.php

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
namespace Magento\Framework\GraphQl\Query;
99

1010
use GraphQL\Error\ClientAware;
11-
use Magento\Framework\GraphQl\Query\Resolver\LoggerFactoryInterface;
11+
use Psr\Log\LoggerInterface;
1212

1313
/**
1414
* @inheritDoc
@@ -17,21 +17,18 @@
1717
*/
1818
class ErrorHandler implements ErrorHandlerInterface
1919
{
20-
const SERVER_LOG_FILE = 'var/log/graphql/server/exception.log';
21-
const CLIENT_LOG_FILE = 'var/log/graphql/client/exception.log';
22-
2320
/**
24-
* @var LoggerFactoryInterface
21+
* @var LoggerInterface
2522
*/
26-
private $loggerFactory;
23+
private $logger;
2724

2825
/**
29-
* @param LoggerFactoryInterface $loggerFactory
26+
* @param LoggerInterface $logger
3027
*/
3128
public function __construct(
32-
LoggerFactoryInterface $loggerFactory
29+
LoggerInterface $logger
3330
) {
34-
$this->loggerFactory = $loggerFactory;
31+
$this->logger = $logger;
3532
}
3633

3734
/**
@@ -41,7 +38,7 @@ public function handle(array $errors, callable $formatter): array
4138
{
4239
return array_map(
4340
function (ClientAware $error) use ($formatter) {
44-
$this->loggerFactory->getLogger($error)->error($error);
41+
$this->logger->error($error);
4542

4643
return $formatter($error);
4744
},

lib/internal/Magento/Framework/GraphQl/Query/Resolver/LoggerFactory.php

Lines changed: 0 additions & 39 deletions
This file was deleted.

lib/internal/Magento/Framework/GraphQl/Query/Resolver/LoggerFactoryInterface.php

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)