mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-06 05:07:36 +02:00
Code Issues Releases Wiki Activity

Close and reopen file handles if a write fails (#1882)

Browse Source 
* Close file handle after each write, refs #1862, refs #1860, refs #1634

* Modify patch to retry writes once if they fail, then throw if not

* Fix php7.2 build
This commit is contained in:
Jordi Boggiano
2024-11-11 20:08:58 +01:00
committed by GitHub
parent b92508d0d7
commit 0779fb91e5
2 changed files with 92 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
tests/Monolog/Handler/StreamHandlerTest.php
View File

@@ -17,6 +17,13 @@ use Monolog\Logger;
class StreamHandlerTest extends TestCase
{
public function tearDown(): void
{
parent::tearDown();
@unlink(__DIR__.'/test.log');
}
/**
* @covers Monolog\Handler\StreamHandler::__construct
* @covers Monolog\Handler\StreamHandler::write
@@ -54,9 +61,9 @@ class StreamHandlerTest extends TestCase
$handler->handle($this->getRecord(Logger::WARNING, 'test'));
$stream = $handler->getStream();
$this->assertTrue(is_resource($stream));
$this->assertTrue(\is_resource($stream));
$handler->close();
$this->assertFalse(is_resource($stream));
$this->assertFalse(\is_resource($stream));
}
/**
@@ -204,6 +211,63 @@ STRING;
$handler->handle($this->getRecord());
}
/**
* @covers Monolog\Handler\StreamHandler::write
*/
public function testWriteErrorDuringWriteRetriesWithClose()
{
$handler = $this->getMockBuilder(StreamHandler::class)
->onlyMethods(['streamWrite'])
->setConstructorArgs(['file://'.sys_get_temp_dir().'/bar/'.rand(0, 10000).DIRECTORY_SEPARATOR.rand(0, 10000)])
->getMock();
$refs = [];
$handler->expects($this->exactly(2))
->method('streamWrite')
->willReturnCallback(function ($stream) use (&$refs) {
$refs[] = $stream;
if (\count($refs) === 2) {
self::assertNotSame($stream, $refs[0]);
}
if (\count($refs) === 1) {
trigger_error('fwrite(): Write of 378 bytes failed with errno=32 Broken pipe', E_USER_ERROR);
}
});
$handler->handle($this->getRecord());
if (method_exists($this, 'assertIsClosedResource')) {
self::assertIsClosedResource($refs[0]);
self::assertIsResource($refs[1]);
}
}
/**
* @covers Monolog\Handler\StreamHandler::write
*/
public function testWriteErrorDuringWriteRetriesButThrowsIfStillFails()
{
$handler = $this->getMockBuilder(StreamHandler::class)
->onlyMethods(['streamWrite'])
->setConstructorArgs(['file://'.sys_get_temp_dir().'/bar/'.rand(0, 10000).DIRECTORY_SEPARATOR.rand(0, 10000)])
->getMock();
$refs = [];
$handler->expects($this->exactly(2))
->method('streamWrite')
->willReturnCallback(function ($stream) use (&$refs) {
$refs[] = $stream;
if (\count($refs) === 2) {
self::assertNotSame($stream, $refs[0]);
}
trigger_error('fwrite(): Write of 378 bytes failed with errno=32 Broken pipe', E_USER_ERROR);
});
self::expectException(\UnexpectedValueException::class);
self::expectExceptionMessage('Writing to the log file failed: Write of 378 bytes failed with errno=32 Broken pipe
The exception occurred while attempting to log: test');
$handler->handle($this->getRecord());
}
/**
* @covers Monolog\Handler\StreamHandler::__construct
* @covers Monolog\Handler\StreamHandler::write