mirror of
https://github.com/Seldaek/monolog.git
synced 2025-08-11 15:44:34 +02:00
Merge branch '1.x'
This commit is contained in:
Jordi Boggiano
@@ -21,7 +21,7 @@ class BrowserConsoleHandlerTest extends TestCase
|
||||
{
|
||||
protected function setUp()
|
||||
{
|
||||
BrowserConsoleHandler::reset();
|
||||
BrowserConsoleHandler::resetStatic();
|
||||
}
|
||||
|
||||
protected function generateScript()
|
||||
|
||||
@@ -21,7 +21,7 @@ class ChromePHPHandlerTest extends TestCase
|
||||
{
|
||||
protected function setUp()
|
||||
{
|
||||
TestChromePHPHandler::reset();
|
||||
TestChromePHPHandler::resetStatic();
|
||||
$_SERVER['HTTP_USER_AGENT'] = 'Monolog Test; Chrome/1.0';
|
||||
}
|
||||
|
||||
@@ -136,7 +136,7 @@ class TestChromePHPHandler extends ChromePHPHandler
|
||||
{
|
||||
protected $headers = [];
|
||||
|
||||
public static function reset()
|
||||
public static function resetStatic()
|
||||
{
|
||||
self::$initialized = false;
|
||||
self::$overflowed = false;
|
||||
|
||||
@@ -58,7 +58,7 @@ class FingersCrossedHandlerTest extends TestCase
|
||||
* @covers Monolog\Handler\FingersCrossedHandler::activate
|
||||
* @covers Monolog\Handler\FingersCrossedHandler::reset
|
||||
*/
|
||||
public function testHandleRestartBufferingAfterReset()
|
||||
public function testHandleResetBufferingAfterReset()
|
||||
{
|
||||
$test = new TestHandler();
|
||||
$handler = new FingersCrossedHandler($test);
|
||||
@@ -76,7 +76,7 @@ class FingersCrossedHandlerTest extends TestCase
|
||||
* @covers Monolog\Handler\FingersCrossedHandler::handle
|
||||
* @covers Monolog\Handler\FingersCrossedHandler::activate
|
||||
*/
|
||||
public function testHandleRestartBufferingAfterBeingTriggeredWhenStopBufferingIsDisabled()
|
||||
public function testHandleResetBufferingAfterBeingTriggeredWhenStopBufferingIsDisabled()
|
||||
{
|
||||
$test = new TestHandler();
|
||||
$handler = new FingersCrossedHandler($test, Logger::WARNING, 0, false, false);
|
||||
|
||||
@@ -21,7 +21,7 @@ class FirePHPHandlerTest extends TestCase
|
||||
{
|
||||
public function setUp()
|
||||
{
|
||||
TestFirePHPHandler::reset();
|
||||
TestFirePHPHandler::resetStatic();
|
||||
$_SERVER['HTTP_USER_AGENT'] = 'Monolog Test; FirePHP/1.0';
|
||||
}
|
||||
|
||||
@@ -77,7 +77,7 @@ class TestFirePHPHandler extends FirePHPHandler
|
||||
{
|
||||
protected $headers = [];
|
||||
|
||||
public static function reset()
|
||||
public static function resetStatic()
|
||||
{
|
||||
self::$initialized = false;
|
||||
self::$sendHeaders = true;
|
||||
|
||||
@@ -635,4 +635,77 @@ class LoggerTest extends \PHPUnit\Framework\TestCase
|
||||
$logger->pushHandler($handler);
|
||||
$logger->info('test');
|
||||
}
|
||||
|
||||
public function testReset()
|
||||
{
|
||||
$logger = new Logger('app');
|
||||
|
||||
$testHandler = new Handler\TestHandler();
|
||||
$bufferHandler = new Handler\BufferHandler($testHandler);
|
||||
$groupHandler = new Handler\GroupHandler(array($bufferHandler));
|
||||
$fingersCrossedHandler = new Handler\FingersCrossedHandler($groupHandler);
|
||||
|
||||
$logger->pushHandler($fingersCrossedHandler);
|
||||
|
||||
$processorUid1 = new Processor\UidProcessor(10);
|
||||
$uid1 = $processorUid1->getUid();
|
||||
$groupHandler->pushProcessor($processorUid1);
|
||||
|
||||
$processorUid2 = new Processor\UidProcessor(5);
|
||||
$uid2 = $processorUid2->getUid();
|
||||
$logger->pushProcessor($processorUid2);
|
||||
|
||||
$getProperty = function ($object, $property) {
|
||||
$reflectionProperty = new \ReflectionProperty(get_class($object), $property);
|
||||
$reflectionProperty->setAccessible(true);
|
||||
|
||||
return $reflectionProperty->getValue($object);
|
||||
};
|
||||
$that = $this;
|
||||
$assertBufferOfBufferHandlerEmpty = function () use ($getProperty, $bufferHandler, $that) {
|
||||
$that->assertEmpty($getProperty($bufferHandler, 'buffer'));
|
||||
};
|
||||
$assertBuffersEmpty = function() use ($assertBufferOfBufferHandlerEmpty, $getProperty, $fingersCrossedHandler, $that) {
|
||||
$assertBufferOfBufferHandlerEmpty();
|
||||
$that->assertEmpty($getProperty($fingersCrossedHandler, 'buffer'));
|
||||
};
|
||||
|
||||
$logger->debug('debug');
|
||||
$logger->reset();
|
||||
$assertBuffersEmpty();
|
||||
$this->assertFalse($testHandler->hasDebugRecords());
|
||||
$this->assertFalse($testHandler->hasErrorRecords());
|
||||
$this->assertNotSame($uid1, $uid1 = $processorUid1->getUid());
|
||||
$this->assertNotSame($uid2, $uid2 = $processorUid2->getUid());
|
||||
|
||||
$logger->debug('debug');
|
||||
$logger->error('error');
|
||||
$logger->reset();
|
||||
$assertBuffersEmpty();
|
||||
$this->assertTrue($testHandler->hasDebugRecords());
|
||||
$this->assertTrue($testHandler->hasErrorRecords());
|
||||
$this->assertNotSame($uid1, $uid1 = $processorUid1->getUid());
|
||||
$this->assertNotSame($uid2, $uid2 = $processorUid2->getUid());
|
||||
|
||||
$logger->info('info');
|
||||
$this->assertNotEmpty($getProperty($fingersCrossedHandler, 'buffer'));
|
||||
$assertBufferOfBufferHandlerEmpty();
|
||||
$this->assertFalse($testHandler->hasInfoRecords());
|
||||
|
||||
$logger->reset();
|
||||
$assertBuffersEmpty();
|
||||
$this->assertFalse($testHandler->hasInfoRecords());
|
||||
$this->assertNotSame($uid1, $uid1 = $processorUid1->getUid());
|
||||
$this->assertNotSame($uid2, $uid2 = $processorUid2->getUid());
|
||||
|
||||
$logger->notice('notice');
|
||||
$logger->emergency('emergency');
|
||||
$logger->reset();
|
||||
$assertBuffersEmpty();
|
||||
$this->assertFalse($testHandler->hasInfoRecords());
|
||||
$this->assertTrue($testHandler->hasNoticeRecords());
|
||||
$this->assertTrue($testHandler->hasEmergencyRecords());
|
||||
$this->assertNotSame($uid1, $processorUid1->getUid());
|
||||
$this->assertNotSame($uid2, $processorUid2->getUid());
|
||||
}
|
||||
}
|
||||
|
||||
287
tests/Monolog/SignalHandlerTest.php
Normal file
287
tests/Monolog/SignalHandlerTest.php
Normal file
@@ -0,0 +1,287 @@
|
||||
<?php
|
||||
|
||||
/*
|
||||
* This file is part of the Monolog package.
|
||||
*
|
||||
* (c) Jordi Boggiano <j.boggiano@seld.be>
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace Monolog;
|
||||
|
||||
use Monolog\Handler\StreamHandler;
|
||||
use Monolog\Handler\TestHandler;
|
||||
use Psr\Log\LogLevel;
|
||||
|
||||
/**
|
||||
* @author Robert Gust-Bardon <robert@gust-bardon.org>
|
||||
* @covers Monolog\SignalHandler
|
||||
*/
|
||||
class SignalHandlerTest extends TestCase
|
||||
{
|
||||
|
||||
private $asyncSignalHandling;
|
||||
private $blockedSignals;
|
||||
private $signalHandlers;
|
||||
|
||||
protected function setUp()
|
||||
{
|
||||
$this->signalHandlers = array();
|
||||
if (extension_loaded('pcntl')) {
|
||||
if (function_exists('pcntl_async_signals')) {
|
||||
$this->asyncSignalHandling = pcntl_async_signals();
|
||||
}
|
||||
if (function_exists('pcntl_sigprocmask')) {
|
||||
pcntl_sigprocmask(SIG_BLOCK, array(), $this->blockedSignals);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected function tearDown()
|
||||
{
|
||||
if ($this->asyncSignalHandling !== null) {
|
||||
pcntl_async_signals($this->asyncSignalHandling);
|
||||
}
|
||||
if ($this->blockedSignals !== null) {
|
||||
pcntl_sigprocmask(SIG_SETMASK, $this->blockedSignals);
|
||||
}
|
||||
if ($this->signalHandlers) {
|
||||
pcntl_signal_dispatch();
|
||||
foreach ($this->signalHandlers as $signo => $handler) {
|
||||
pcntl_signal($signo, $handler);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private function setSignalHandler($signo, $handler = SIG_DFL) {
|
||||
if (function_exists('pcntl_signal_get_handler')) {
|
||||
$this->signalHandlers[$signo] = pcntl_signal_get_handler($signo);
|
||||
} else {
|
||||
$this->signalHandlers[$signo] = SIG_DFL;
|
||||
}
|
||||
$this->assertTrue(pcntl_signal($signo, $handler));
|
||||
}
|
||||
|
||||
public function testHandleSignal()
|
||||
{
|
||||
$logger = new Logger('test', array($handler = new TestHandler));
|
||||
$errHandler = new SignalHandler($logger);
|
||||
$signo = 2; // SIGINT.
|
||||
$siginfo = array('signo' => $signo, 'errno' => 0, 'code' => 0);
|
||||
$errHandler->handleSignal($signo, $siginfo);
|
||||
$this->assertCount(1, $handler->getRecords());
|
||||
$this->assertTrue($handler->hasCriticalRecords());
|
||||
$records = $handler->getRecords();
|
||||
$this->assertSame($siginfo, $records[0]['context']);
|
||||
}
|
||||
|
||||
/**
|
||||
* @depends testHandleSignal
|
||||
* @requires extension pcntl
|
||||
* @requires extension posix
|
||||
* @requires function pcntl_signal
|
||||
* @requires function pcntl_signal_dispatch
|
||||
* @requires function posix_getpid
|
||||
* @requires function posix_kill
|
||||
*/
|
||||
public function testRegisterSignalHandler()
|
||||
{
|
||||
// SIGCONT and SIGURG should be ignored by default.
|
||||
if (!defined('SIGCONT') || !defined('SIGURG')) {
|
||||
$this->markTestSkipped('This test requires the SIGCONT and SIGURG pcntl constants.');
|
||||
}
|
||||
|
||||
$this->setSignalHandler(SIGCONT, SIG_IGN);
|
||||
$this->setSignalHandler(SIGURG, SIG_IGN);
|
||||
|
||||
$logger = new Logger('test', array($handler = new TestHandler));
|
||||
$errHandler = new SignalHandler($logger);
|
||||
$pid = posix_getpid();
|
||||
|
||||
$this->assertTrue(posix_kill($pid, SIGURG));
|
||||
$this->assertTrue(pcntl_signal_dispatch());
|
||||
$this->assertCount(0, $handler->getRecords());
|
||||
|
||||
$errHandler->registerSignalHandler(SIGURG, LogLevel::INFO, false, false, false);
|
||||
|
||||
$this->assertTrue(posix_kill($pid, SIGCONT));
|
||||
$this->assertTrue(pcntl_signal_dispatch());
|
||||
$this->assertCount(0, $handler->getRecords());
|
||||
|
||||
$this->assertTrue(posix_kill($pid, SIGURG));
|
||||
$this->assertTrue(pcntl_signal_dispatch());
|
||||
$this->assertCount(1, $handler->getRecords());
|
||||
$this->assertTrue($handler->hasInfoThatContains('SIGURG'));
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider defaultPreviousProvider
|
||||
* @depends testRegisterSignalHandler
|
||||
* @requires function pcntl_fork
|
||||
* @requires function pcntl_sigprocmask
|
||||
* @requires function pcntl_waitpid
|
||||
*/
|
||||
public function testRegisterDefaultPreviousSignalHandler($signo, $callPrevious, $expected)
|
||||
{
|
||||
$this->setSignalHandler($signo, SIG_DFL);
|
||||
|
||||
$path = tempnam(sys_get_temp_dir(), 'monolog-');
|
||||
$this->assertNotFalse($path);
|
||||
|
||||
$pid = pcntl_fork();
|
||||
if ($pid === 0) { // Child.
|
||||
$streamHandler = new StreamHandler($path);
|
||||
$streamHandler->setFormatter($this->getIdentityFormatter());
|
||||
$logger = new Logger('test', array($streamHandler));
|
||||
$errHandler = new SignalHandler($logger);
|
||||
$errHandler->registerSignalHandler($signo, LogLevel::INFO, $callPrevious, false, false);
|
||||
pcntl_sigprocmask(SIG_SETMASK, array(SIGCONT));
|
||||
posix_kill(posix_getpid(), $signo);
|
||||
pcntl_signal_dispatch();
|
||||
// If $callPrevious is true, SIGINT should terminate by this line.
|
||||
pcntl_sigprocmask(SIG_BLOCK, array(), $oldset);
|
||||
file_put_contents($path, implode(' ', $oldset), FILE_APPEND);
|
||||
posix_kill(posix_getpid(), $signo);
|
||||
pcntl_signal_dispatch();
|
||||
exit();
|
||||
}
|
||||
|
||||
$this->assertNotSame(-1, $pid);
|
||||
$this->assertNotSame(-1, pcntl_waitpid($pid, $status));
|
||||
$this->assertNotSame(-1, $status);
|
||||
$this->assertSame($expected, file_get_contents($path));
|
||||
}
|
||||
|
||||
public function defaultPreviousProvider()
|
||||
{
|
||||
if (!defined('SIGCONT') || !defined('SIGINT') || !defined('SIGURG')) {
|
||||
return array();
|
||||
}
|
||||
|
||||
return array(
|
||||
array(SIGINT, false, 'Program received signal SIGINT'.SIGCONT.'Program received signal SIGINT'),
|
||||
array(SIGINT, true, 'Program received signal SIGINT'),
|
||||
array(SIGURG, false, 'Program received signal SIGURG'.SIGCONT.'Program received signal SIGURG'),
|
||||
array(SIGURG, true, 'Program received signal SIGURG'.SIGCONT.'Program received signal SIGURG'),
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider callablePreviousProvider
|
||||
* @depends testRegisterSignalHandler
|
||||
* @requires function pcntl_signal_get_handler
|
||||
*/
|
||||
public function testRegisterCallablePreviousSignalHandler($callPrevious)
|
||||
{
|
||||
$this->setSignalHandler(SIGURG, SIG_IGN);
|
||||
|
||||
$logger = new Logger('test', array($handler = new TestHandler));
|
||||
$errHandler = new SignalHandler($logger);
|
||||
$previousCalled = 0;
|
||||
pcntl_signal(SIGURG, function ($signo, array $siginfo = null) use (&$previousCalled) {
|
||||
++$previousCalled;
|
||||
});
|
||||
$errHandler->registerSignalHandler(SIGURG, LogLevel::INFO, $callPrevious, false, false);
|
||||
$this->assertTrue(posix_kill(posix_getpid(), SIGURG));
|
||||
$this->assertTrue(pcntl_signal_dispatch());
|
||||
$this->assertCount(1, $handler->getRecords());
|
||||
$this->assertTrue($handler->hasInfoThatContains('SIGURG'));
|
||||
$this->assertSame($callPrevious ? 1 : 0, $previousCalled);
|
||||
}
|
||||
|
||||
public function callablePreviousProvider()
|
||||
{
|
||||
return array(
|
||||
array(false),
|
||||
array(true),
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider restartSyscallsProvider
|
||||
* @depends testRegisterDefaultPreviousSignalHandler
|
||||
* @requires function pcntl_fork
|
||||
* @requires function pcntl_waitpid
|
||||
*/
|
||||
public function testRegisterSyscallRestartingSignalHandler($restartSyscalls)
|
||||
{
|
||||
$this->setSignalHandler(SIGURG, SIG_IGN);
|
||||
|
||||
$parentPid = posix_getpid();
|
||||
$microtime = microtime(true);
|
||||
|
||||
$pid = pcntl_fork();
|
||||
if ($pid === 0) { // Child.
|
||||
usleep(100000);
|
||||
posix_kill($parentPid, SIGURG);
|
||||
usleep(100000);
|
||||
exit();
|
||||
}
|
||||
|
||||
$this->assertNotSame(-1, $pid);
|
||||
$logger = new Logger('test', array($handler = new TestHandler));
|
||||
$errHandler = new SignalHandler($logger);
|
||||
$errHandler->registerSignalHandler(SIGURG, LogLevel::INFO, false, $restartSyscalls, false);
|
||||
if ($restartSyscalls) {
|
||||
// pcntl_wait is expected to be restarted after the signal handler.
|
||||
$this->assertNotSame(-1, pcntl_waitpid($pid, $status));
|
||||
} else {
|
||||
// pcntl_wait is expected to be interrupted when the signal handler is invoked.
|
||||
$this->assertSame(-1, pcntl_waitpid($pid, $status));
|
||||
}
|
||||
$this->assertSame($restartSyscalls, microtime(true) - $microtime > 0.15);
|
||||
$this->assertTrue(pcntl_signal_dispatch());
|
||||
$this->assertCount(1, $handler->getRecords());
|
||||
if ($restartSyscalls) {
|
||||
// The child has already exited.
|
||||
$this->assertSame(-1, pcntl_waitpid($pid, $status));
|
||||
} else {
|
||||
// The child has not exited yet.
|
||||
$this->assertNotSame(-1, pcntl_waitpid($pid, $status));
|
||||
}
|
||||
}
|
||||
|
||||
public function restartSyscallsProvider()
|
||||
{
|
||||
return array(
|
||||
array(false),
|
||||
array(true),
|
||||
array(false),
|
||||
array(true),
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider asyncProvider
|
||||
* @depends testRegisterDefaultPreviousSignalHandler
|
||||
* @requires function pcntl_async_signals
|
||||
*/
|
||||
public function testRegisterAsyncSignalHandler($initialAsync, $desiredAsync, $expectedBefore, $expectedAfter)
|
||||
{
|
||||
$this->setSignalHandler(SIGURG, SIG_IGN);
|
||||
pcntl_async_signals($initialAsync);
|
||||
|
||||
$logger = new Logger('test', array($handler = new TestHandler));
|
||||
$errHandler = new SignalHandler($logger);
|
||||
$errHandler->registerSignalHandler(SIGURG, LogLevel::INFO, false, false, $desiredAsync);
|
||||
$this->assertTrue(posix_kill(posix_getpid(), SIGURG));
|
||||
$this->assertCount($expectedBefore, $handler->getRecords());
|
||||
$this->assertTrue(pcntl_signal_dispatch());
|
||||
$this->assertCount($expectedAfter, $handler->getRecords());
|
||||
}
|
||||
|
||||
public function asyncProvider()
|
||||
{
|
||||
return array(
|
||||
array(false, false, 0, 1),
|
||||
array(false, null, 0, 1),
|
||||
array(false, true, 1, 1),
|
||||
array(true, false, 0, 1),
|
||||
array(true, null, 1, 1),
|
||||
array(true, true, 1, 1),
|
||||
);
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user