GraphQl-220: Implement exception logging.

Stopped using arguments with the same type

Author: novikor

app/etc/graphql/di.xml

@@ -7,12 +7,7 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <preference for="Magento\Framework\GraphQl\Query\ErrorHandlerInterface" type="Magento\Framework\GraphQl\Query\ErrorHandler"/>
-    <type name="Magento\Framework\GraphQl\Query\Resolver\ResolveLogger">
-        <arguments>
-            <argument name="clientLogger" xsi:type="object">GraphQLClientLogger</argument>
-            <argument name="serverLogger" xsi:type="object">GraphQLServerLogger</argument>
-        </arguments>
-    </type>
+    <preference for="Magento\Framework\GraphQl\Query\Resolver\LoggerFactoryInterface" type="Magento\Framework\GraphQl\Query\Resolver\LoggerFactory"/>
     <virtualType name="GraphQLClientLogger" type="Magento\Framework\Logger\Monolog">
         <arguments>
             <argument name="handlers" xsi:type="array">
@@ -37,5 +32,4 @@
             <argument name="fileName" xsi:type="const">Magento\Framework\GraphQl\Query\ErrorHandler::SERVER_LOG_FILE</argument>
         </arguments>
     </virtualType>
-    <preference for="Magento\Framework\GraphQl\Query\Resolver\ResolveLoggerInterface" type="Magento\Framework\GraphQl\Query\Resolver\ResolveLogger"/>
 </config>

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

@@ -8,7 +8,7 @@
 namespace Magento\Framework\GraphQl\Query;
 
 use GraphQL\Error\ClientAware;
-use Magento\Framework\GraphQl\Query\Resolver\ResolveLoggerInterface;
+use Magento\Framework\GraphQl\Query\Resolver\LoggerFactoryInterface;
 
 /**
  * @inheritDoc
@@ -21,17 +21,17 @@ class ErrorHandler implements ErrorHandlerInterface
     const CLIENT_LOG_FILE = 'var/log/graphql/client/exception.log';
 
     /**
-     * @var ResolveLoggerInterface
+     * @var LoggerFactoryInterface
      */
-    private $resolveLogger;
+    private $loggerFactory;
 
     /**
-     * @param ResolveLoggerInterface $resolveLogger
+     * @param LoggerFactoryInterface $loggerFactory
      */
     public function __construct(
-        ResolveLoggerInterface $resolveLogger
+        LoggerFactoryInterface $loggerFactory
     ) {
-        $this->resolveLogger = $resolveLogger;
+        $this->loggerFactory = $loggerFactory;
     }
 
     /**
@@ -41,7 +41,7 @@ public function handle(array $errors, callable $formatter): array
     {
         return array_map(
             function (ClientAware $error) use ($formatter) {
-                $this->resolveLogger->execute($error)->error($error);
+                $this->loggerFactory->getLogger($error)->error($error);
 
                 return $formatter($error);
             },

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

@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Query\Resolver;
+
+use GraphQL\Error\ClientAware;
+use Magento\Framework\ObjectManagerInterface;
+use Psr\Log\LoggerInterface;
+
+/**
+ * @inheritDoc
+ */
+class LoggerFactory implements LoggerFactoryInterface
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    public function __construct(
+        ObjectManagerInterface $objectManager
+    ) {
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getLogger(ClientAware $clientAware): LoggerInterface
+    {
+        return $clientAware->isClientSafe() ?
+            $this->objectManager->get('GraphQLClientLogger') :
+            $this->objectManager->get('GraphQLServerLogger');
+    }
+}

lib/internal/Magento/Framework/GraphQl/Query/Resolver/ResolveLoggerInterface.php renamed to lib/internal/Magento/Framework/GraphQl/Query/Resolver/LoggerFactoryInterface.php

@@ -15,7 +15,7 @@
  *
  * @api
  */
-interface ResolveLoggerInterface
+interface LoggerFactoryInterface
 {
     /**
      * Get logger to use for certain ClientAware exception
@@ -24,5 +24,5 @@ interface ResolveLoggerInterface
      *
      * @return LoggerInterface
      */
-    public function execute(ClientAware $clientAware): LoggerInterface;
+    public function getLogger(ClientAware $clientAware): LoggerInterface;
 }