Skip to content

Commit d40388e

Browse files
author
Maksym Novik
committed
GraphQl-220: Implement exception logging #355.
Cleaned up code.
1 parent 8de22af commit d40388e

File tree

2 files changed

+24
-18
lines changed

2 files changed

+24
-18
lines changed

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

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77

88
namespace Magento\Framework\GraphQl\Query;
99

10+
use GraphQL\Error\ClientAware;
11+
use GraphQL\Error\Error;
12+
use Magento\Framework\Logger\Monolog;
13+
1014
/**
1115
* Class ErrorHandler
1216
*
@@ -15,12 +19,12 @@
1519
class ErrorHandler implements ErrorHandlerInterface
1620
{
1721
/**
18-
* @var \Magento\Framework\Logger\Monolog
22+
* @var Monolog
1923
*/
2024
private $clientLogger;
2125

2226
/**
23-
* @var \Magento\Framework\Logger\Monolog
27+
* @var Monolog
2428
*/
2529
private $serverLogger;
2630

@@ -35,25 +39,25 @@ class ErrorHandler implements ErrorHandlerInterface
3539
private $serverErrorCategories;
3640

3741
/**
38-
* @var \Magento\Framework\Logger\Monolog
42+
* @var Monolog
3943
*/
4044
private $generalLogger;
4145

4246
/**
4347
* ErrorHandler constructor.
4448
*
45-
* @param \Magento\Framework\Logger\Monolog $clientLogger
46-
* @param \Magento\Framework\Logger\Monolog $serverLogger
47-
* @param \Magento\Framework\Logger\Monolog $generalLogger
48-
* @param array $clientErrorCategories
49-
* @param array $serverErrorCategories
49+
* @param Monolog $clientLogger
50+
* @param Monolog $serverLogger
51+
* @param Monolog $generalLogger
52+
* @param array $clientErrorCategories
53+
* @param array $serverErrorCategories
5054
*
5155
* @SuppressWarnings(PHPMD.LongVariable)
5256
*/
5357
public function __construct(
54-
\Magento\Framework\Logger\Monolog $clientLogger,
55-
\Magento\Framework\Logger\Monolog $serverLogger,
56-
\Magento\Framework\Logger\Monolog $generalLogger,
58+
Monolog $clientLogger,
59+
Monolog $serverLogger,
60+
Monolog $generalLogger,
5761
array $clientErrorCategories = [],
5862
array $serverErrorCategories = []
5963
) {
@@ -67,15 +71,15 @@ public function __construct(
6771
/**
6872
* Handle errors
6973
*
70-
* @param \GraphQL\Error\Error[] $errors
71-
* @param callable $formatter
74+
* @param Error[] $errors
75+
* @param callable $formatter
7276
*
7377
* @return array
7478
*/
75-
public function handle(array $errors, callable $formatter):array
79+
public function handle(array $errors, callable $formatter): array
7680
{
7781
return array_map(
78-
function (\GraphQL\Error\ClientAware $error) use ($formatter) {
82+
function (ClientAware $error) use ($formatter) {
7983
$this->logError($error);
8084

8185
return $formatter($error);
@@ -85,11 +89,11 @@ function (\GraphQL\Error\ClientAware $error) use ($formatter) {
8589
}
8690

8791
/**
88-
* @param \GraphQL\Error\ClientAware $error
92+
* @param ClientAware $error
8993
*
9094
* @return boolean
9195
*/
92-
private function logError(\GraphQL\Error\ClientAware $error):bool
96+
private function logError(ClientAware $error): bool
9397
{
9498
if (in_array($error->getCategory(), $this->clientErrorCategories)) {
9599
return $this->clientLogger->error($error);

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88
namespace Magento\Framework\GraphQl\Query;
99

10+
use GraphQL\Error\Error;
11+
1012
/**
1113
* Interface ErrorHandlerInterface
1214
*
@@ -20,7 +22,7 @@ interface ErrorHandlerInterface
2022
/**
2123
* Handle errors
2224
*
23-
* @param \GraphQL\Error\Error[] $errors
25+
* @param Error[] $errors
2426
* @param callable $formatter
2527
*
2628
* @return array

0 commit comments

Comments
 (0)