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

Make handlers more serializable by default by having them close() before sleeping, fixes #365

Browse Source
This commit is contained in:
Jordi Boggiano
2016-05-26 21:13:52 +01:00
parent 017aa2cb75
commit af7c0a7bda
2 changed files with 37 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Monolog/Handler/Handler.php
View File

@@ -43,4 +43,11 @@ abstract class Handler implements HandlerInterface
// do nothing // do nothing
} }
} }
public function __sleep()
{
$this->close();
return array_keys(get_object_vars($this));
}
} }

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

@@ -51,13 +51,38 @@ class StreamHandlerTest extends TestCase
{ {
$handler = new StreamHandler('php://memory'); $handler = new StreamHandler('php://memory');
$handler->handle($this->getRecord(Logger::WARNING, 'test')); $handler->handle($this->getRecord(Logger::WARNING, 'test'));
$streamProp = new \ReflectionProperty('Monolog\Handler\StreamHandler', 'stream'); $stream = $handler->getStream();
$streamProp->setAccessible(true);
$handle = $streamProp->getValue($handler);
$this->assertTrue(is_resource($handle)); $this->assertTrue(is_resource($stream));
$handler->close(); $handler->close();
$this->assertFalse(is_resource($handle)); $this->assertFalse(is_resource($stream));
}
/**
* @covers Monolog\Handler\StreamHandler::close
* @covers Monolog\Handler\Handler::__sleep
*/
public function testSerialization()
{
$handler = new StreamHandler('php://memory');
$handler->handle($this->getRecord(Logger::WARNING, 'testfoo'));
$stream = $handler->getStream();
$this->assertTrue(is_resource($stream));
fseek($stream, 0);
$this->assertContains('testfoo', stream_get_contents($stream));
$serialized = serialize($handler);
$this->assertFalse(is_resource($stream));
$handler = unserialize($serialized);
$handler->handle($this->getRecord(Logger::WARNING, 'testbar'));
$stream = $handler->getStream();
$this->assertTrue(is_resource($stream));
fseek($stream, 0);
$contents = stream_get_contents($stream);
$this->assertNotContains('testfoo', $contents);
$this->assertContains('testbar', $contents);
} }
/** /**