mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-07-31 10:20:14 +02:00
Code Issues Releases Wiki Activity

Only close handles that have been opened by the StreamHandler, fixes #764

Browse Source
This commit is contained in:
Jordi Boggiano
2016-04-10 13:01:10 +01:00
parent ccdc8b530c
commit a7ade9d68f
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Monolog/Handler/StreamHandler.php
View File

@@ -59,7 +59,7 @@ class StreamHandler extends AbstractProcessingHandler
*/
public function close()
{
if (is_resource($this->stream)) {
if ($this->url && is_resource($this->stream)) {
fclose($this->stream);
}
$this->stream = null;

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

@@ -35,10 +35,26 @@ class StreamHandlerTest extends TestCase
/**
* @covers Monolog\Handler\StreamHandler::close
*/
public function testClose()
public function testCloseKeepsExternalHandlersOpen()
{
$handle = fopen('php://memory', 'a+');
$handler = new StreamHandler($handle);
$this->assertTrue(is_resource($handle));
$handler->close();
$this->assertTrue(is_resource($handle));
}
/**
* @covers Monolog\Handler\StreamHandler::close
*/
public function testClose()
{
$handler = new StreamHandler('php://memory');
$handler->handle($this->getRecord(Logger::WARNING, 'test'));
$streamProp = new \ReflectionProperty('Monolog\Handler\StreamHandler', 'stream');
$streamProp->setAccessible(true);
$handle = $streamProp->getValue($handler);
$this->assertTrue(is_resource($handle));
$handler->close();
$this->assertFalse(is_resource($handle));