Skip to content

Commit 3ae5075

Browse files
makaomakao
committed
Logger refactor
1 parent b4c36c1 commit 3ae5075

9 files changed

Lines changed: 45 additions & 44 deletions

File tree

‎Logger/Handler.php‎

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

‎Logger/Logger.php‎

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

‎Model/Indexer/ProfileIndexer.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ class ProfileIndexer
1010
public function __construct(
1111
private \Magento\Framework\Filesystem\Driver\File $fileSystem,
1212
private \Magento\Framework\Filesystem\File\WriteFactory $fileWriteFactory,
13-
private \ClawRock\Debug\Logger\Logger $logger,
14-
private \ClawRock\Debug\Helper\File $fileHelper
13+
private \ClawRock\Debug\Helper\File $fileHelper,
14+
private \Psr\Log\LoggerInterface $logger
1515
) {
1616
}
1717

@@ -30,7 +30,7 @@ public function index(ProfileInterface $profile): void
3030
: '';
3131

3232
$this->fileSystem->filePutContents($this->fileHelper->getProfileIndex(), $index);
33-
} catch (\Exception $e) {
33+
} catch (\Throwable $e) {
3434
$this->logger->error('ClawRock_Debug: Error during profile indexation', ['exception' => $e]);
3535
}
3636
}

‎Model/Profiler.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function __construct(
3030
private \ClawRock\Debug\Model\Storage\ProfileMemoryStorage $profileMemoryStorage,
3131
private \ClawRock\Debug\Api\ProfileRepositoryInterface $profileRepository,
3232
private \ClawRock\Debug\Model\Storage\HttpStorage $httpStorage,
33-
private \ClawRock\Debug\Logger\Logger $logger
33+
private \Psr\Log\LoggerInterface $logger
3434
) {
3535
}
3636

@@ -43,7 +43,7 @@ public function run(Request $request, Response $response): void
4343
try {
4444
$profile = $this->collect($request, $response);
4545
$this->profileMemoryStorage->write($profile);
46-
} catch (\Exception $e) {
46+
} catch (\Throwable $e) {
4747
$this->logger->error($e->getMessage());
4848

4949
return;
@@ -144,7 +144,7 @@ public function onTerminate(): void
144144
}
145145

146146
$this->profileRepository->save($profile);
147-
} catch (\Exception $e) {
147+
} catch (\Throwable $e) {
148148
$this->logger->error('ClawRock_Debug: onTerminate error', ['exception' => $e]);
149149
}
150150
}

‎Model/Serializer/CollectorSerializer.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ class CollectorSerializer
99
{
1010
public function __construct(
1111
private \Magento\Framework\ObjectManagerInterface $objectManager,
12-
private \ClawRock\Debug\Logger\Logger $logger,
13-
private \ClawRock\Debug\Helper\Config $config
12+
private \ClawRock\Debug\Helper\Config $config,
13+
private \Psr\Log\LoggerInterface $logger
1414
) {
1515
}
1616

‎Model/Storage/ProfileFileStorage.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public function __construct(
1414
private \Magento\Framework\Filesystem\Driver\File $fileSystem,
1515
private \Magento\Framework\Filesystem\File\ReadFactory $fileReadFactory,
1616
private \Magento\Framework\Filesystem\File\WriteFactory $fileWriteFactory,
17-
private \ClawRock\Debug\Logger\Logger $logger,
17+
private \Psr\Log\LoggerInterface $logger,
1818
private \ClawRock\Debug\Helper\File $fileHelper,
1919
private \ClawRock\Debug\Model\Serializer\ProfileSerializer $profileSerializer,
2020
private \ClawRock\Debug\Model\Indexer\ProfileIndexer $profileIndexer

‎Test/Unit/Controller/Profiler/PurgeTest.php‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ class PurgeTest extends TestCase
1919
private \Magento\Framework\Controller\Result\Redirect $redirectMock;
2020
/** @var \ClawRock\Debug\Model\Storage\ProfileFileStorage&\PHPUnit\Framework\MockObject\MockObject */
2121
private \ClawRock\Debug\Model\Storage\ProfileFileStorage $profileFileStorageMock;
22-
/** @var \ClawRock\Debug\Logger\Logger&\PHPUnit\Framework\MockObject\MockObject */
23-
private \ClawRock\Debug\Logger\Logger $loggerMock;
22+
/** @var \Psr\Log\LoggerInterface&\PHPUnit\Framework\MockObject\MockObject */
23+
private \Psr\Log\LoggerInterface $loggerMock;
2424
private \ClawRock\Debug\Controller\Profiler\Purge $controller;
2525

2626
protected function setUp(): void
@@ -42,9 +42,7 @@ protected function setUp(): void
4242
->disableOriginalConstructor()
4343
->getMock();
4444

45-
$this->loggerMock = $this->getMockBuilder(\ClawRock\Debug\Logger\Logger::class)
46-
->disableOriginalConstructor()
47-
->getMock();
45+
$this->loggerMock = $this->createMock(\Psr\Log\LoggerInterface::class);
4846

4947
$this->controller = new Purge(
5048
$this->resultFactoryMock,

‎Test/Unit/Model/Storage/ProfileFileStorageTest.php‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ class ProfileFileStorageTest extends TestCase
2121
private \Magento\Framework\Filesystem\File\WriteFactory $fileWriteFactoryMock;
2222
/** @var \Magento\Framework\Filesystem\File\WriteInterface&\PHPUnit\Framework\MockObject\MockObject */
2323
private \Magento\Framework\Filesystem\File\WriteInterface $writeMock;
24-
/** @var \ClawRock\Debug\Logger\Logger&\PHPUnit\Framework\MockObject\MockObject */
25-
private \ClawRock\Debug\Logger\Logger $loggerMock;
24+
/** @var \Psr\Log\LoggerInterface&\PHPUnit\Framework\MockObject\MockObject */
25+
private \Psr\Log\LoggerInterface $loggerMock;
2626
/** @var \ClawRock\Debug\Helper\File&\PHPUnit\Framework\MockObject\MockObject */
2727
private \ClawRock\Debug\Helper\File $fileHelperMock;
2828
/** @var \ClawRock\Debug\Model\Serializer\ProfileSerializer&\PHPUnit\Framework\MockObject\MockObject */
@@ -57,9 +57,7 @@ protected function setUp(): void
5757

5858
$this->writeMock = $this->getMockForAbstractClass(\Magento\Framework\Filesystem\File\WriteInterface::class);
5959

60-
$this->loggerMock = $this->getMockBuilder(\ClawRock\Debug\Logger\Logger::class)
61-
->disableOriginalConstructor()
62-
->getMock();
60+
$this->loggerMock = $this->createMock(\Psr\Log\LoggerInterface::class);
6361

6462
$this->fileHelperMock = $this->getMockBuilder(\ClawRock\Debug\Helper\File::class)
6563
->disableOriginalConstructor()

‎etc/di.xml‎

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@
1212
<argument name="storage" xsi:type="object">ClawRock\Debug\Model\Session\Storage</argument>
1313
</arguments>
1414
</type>
15-
<type name="ClawRock\Debug\Logger\Handler">
15+
<virtualType name="ClawRock\Debug\Logger\Handler" type="Magento\Framework\Logger\Handler\Base">
1616
<arguments>
17-
<argument name="filesystem" xsi:type="object">Magento\Framework\Filesystem\Driver\File</argument>
17+
<argument name="fileName" xsi:type="string">/var/log/profiler.log</argument>
1818
</arguments>
19-
</type>
20-
<type name="ClawRock\Debug\Logger\Logger">
19+
</virtualType>
20+
<virtualType name="ClawRock\Debug\Logger\Logger" type="Magento\Framework\Logger\Monolog">
2121
<arguments>
2222
<argument name="name" xsi:type="string">profiler</argument>
23-
<argument name="handlers" xsi:type="array">
23+
<argument name="handlers" xsi:type="array">
2424
<item name="system" xsi:type="object">ClawRock\Debug\Logger\Handler</item>
2525
</argument>
2626
</arguments>
27-
</type>
27+
</virtualType>
2828
<type name="ClawRock\Debug\Model\Info\CustomerInfo">
2929
<arguments>
3030
<argument name="session" xsi:type="object">Magento\Customer\Model\Session\Proxy</argument>
@@ -110,4 +110,28 @@
110110
</argument>
111111
</arguments>
112112
</type>
113+
114+
<type name="ClawRock\Debug\Model\Indexer\ProfileIndexer">
115+
<arguments>
116+
<argument name="logger" xsi:type="object">ClawRock\Debug\Logger\Logger</argument>
117+
</arguments>
118+
</type>
119+
120+
<type name="ClawRock\Debug\Model\Profiler">
121+
<arguments>
122+
<argument name="logger" xsi:type="object">ClawRock\Debug\Logger\Logger</argument>
123+
</arguments>
124+
</type>
125+
126+
<type name="ClawRock\Debug\Model\Serializer\CollectorSerializer">
127+
<arguments>
128+
<argument name="logger" xsi:type="object">ClawRock\Debug\Logger\Logger</argument>
129+
</arguments>
130+
</type>
131+
132+
<type name="ClawRock\Debug\Model\Storage\ProfileFileStorage">
133+
<arguments>
134+
<argument name="logger" xsi:type="object">ClawRock\Debug\Logger\Logger</argument>
135+
</arguments>
136+
</type>
113137
</config>

0 commit comments

Comments
 (0)