mirror of
https://github.com/Seldaek/monolog.git
synced 2025-08-13 08:34:12 +02:00
Added a BufferHandler to allow batch processing of the records
This commit is contained in:
@@ -62,6 +62,13 @@ abstract class AbstractHandler implements HandlerInterface
|
|||||||
return false === $this->bubble;
|
return false === $this->bubble;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function handleBatch(array $records)
|
||||||
|
{
|
||||||
|
foreach ($records as $record) {
|
||||||
|
$this->handle($record);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
abstract public function write(array $record);
|
abstract public function write(array $record);
|
||||||
|
|
||||||
public function close()
|
public function close()
|
||||||
|
72
src/Monolog/Handler/BufferHandler.php
Normal file
72
src/Monolog/Handler/BufferHandler.php
Normal file
@@ -0,0 +1,72 @@
|
|||||||
|
<?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\Handler;
|
||||||
|
|
||||||
|
use Monolog\Logger;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Buffers all records until closing the handler and then pass them as batch.
|
||||||
|
*
|
||||||
|
* This is useful for a MailHandler to send only one mail per request instead of
|
||||||
|
* sending one per log message.
|
||||||
|
*
|
||||||
|
* @author Christophe Coevoet <stof@notk.org>
|
||||||
|
*/
|
||||||
|
class BufferHandler extends AbstractHandler
|
||||||
|
{
|
||||||
|
protected $handler;
|
||||||
|
protected $bufferSize;
|
||||||
|
protected $buffer = array();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param HandlerInterface $handler Handler.
|
||||||
|
* @param int $bufferSize How many entries should be buffered at most, beyond that the oldest items are removed from the buffer.
|
||||||
|
* @param Boolean $bubble
|
||||||
|
*/
|
||||||
|
public function __construct(HandlerInterface $handler, $bufferSize = 0, $bubble = false)
|
||||||
|
{
|
||||||
|
$this->handler = $handler;
|
||||||
|
$this->bufferSize = $bufferSize;
|
||||||
|
$this->bubble = $bubble;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handles a record
|
||||||
|
*
|
||||||
|
* Records are buffered until closing the handler.
|
||||||
|
*
|
||||||
|
* @param array $record Records
|
||||||
|
* @return Boolean Whether the record was handled
|
||||||
|
*/
|
||||||
|
public function handle(array $record)
|
||||||
|
{
|
||||||
|
$this->buffer[] = $record;
|
||||||
|
if ($this->bufferSize > 0 && count($this->buffer) > $this->bufferSize) {
|
||||||
|
array_shift($this->buffer);
|
||||||
|
}
|
||||||
|
|
||||||
|
return false === $this->bubble;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function close()
|
||||||
|
{
|
||||||
|
$this->handler->handleBatch($this->buffer);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Implemented to comply with the AbstractHandler requirements. Can not be called.
|
||||||
|
*/
|
||||||
|
public function write(array $record)
|
||||||
|
{
|
||||||
|
throw new \BadMethodCallException('This method should not be called directly on the FingersCrossedHandler.');
|
||||||
|
}
|
||||||
|
}
|
@@ -35,6 +35,14 @@ interface HandlerInterface
|
|||||||
*/
|
*/
|
||||||
function handle(array $record);
|
function handle(array $record);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handles a set of records.
|
||||||
|
*
|
||||||
|
* @param array $records The records to handle (an array of record arrays)
|
||||||
|
* @return Boolean Whether the handler stops the propagation in the stack or not.
|
||||||
|
*/
|
||||||
|
function handleBatch(array $records);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Adds a processor in the stack.
|
* Adds a processor in the stack.
|
||||||
*
|
*
|
||||||
|
67
tests/Monolog/Handler/BufferHandlerTest.php
Normal file
67
tests/Monolog/Handler/BufferHandlerTest.php
Normal file
@@ -0,0 +1,67 @@
|
|||||||
|
<?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\Handler;
|
||||||
|
|
||||||
|
use Monolog\Logger;
|
||||||
|
|
||||||
|
class BufferHandlerTest extends \PHPUnit_Framework_TestCase
|
||||||
|
{
|
||||||
|
public function testHandleBuffers()
|
||||||
|
{
|
||||||
|
$test = new TestHandler();
|
||||||
|
$handler = new BufferHandler($test);
|
||||||
|
$handler->handle($this->getRecord(Logger::DEBUG));
|
||||||
|
$handler->handle($this->getRecord(Logger::INFO));
|
||||||
|
$this->assertFalse($test->hasDebugRecords());
|
||||||
|
$this->assertFalse($test->hasInfoRecords());
|
||||||
|
$handler->close();
|
||||||
|
$this->assertTrue($test->hasInfoRecords());
|
||||||
|
$this->assertTrue(count($test->getRecords()) === 2);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testDestructPropagatesRecords()
|
||||||
|
{
|
||||||
|
$test = new TestHandler();
|
||||||
|
$handler = new BufferHandler($test);
|
||||||
|
$handler->handle($this->getRecord(Logger::WARNING));
|
||||||
|
$handler->handle($this->getRecord(Logger::DEBUG));
|
||||||
|
unset ($handler);
|
||||||
|
$this->assertTrue($test->hasWarningRecords());
|
||||||
|
$this->assertTrue($test->hasDebugRecords());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testHandleBufferLimit()
|
||||||
|
{
|
||||||
|
$test = new TestHandler();
|
||||||
|
$handler = new BufferHandler($test, 2);
|
||||||
|
$handler->handle($this->getRecord(Logger::DEBUG));
|
||||||
|
$handler->handle($this->getRecord(Logger::DEBUG));
|
||||||
|
$handler->handle($this->getRecord(Logger::INFO));
|
||||||
|
$handler->handle($this->getRecord(Logger::WARNING));
|
||||||
|
$handler->close();
|
||||||
|
$this->assertTrue($test->hasWarningRecords());
|
||||||
|
$this->assertTrue($test->hasInfoRecords());
|
||||||
|
$this->assertFalse($test->hasDebugRecords());
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function getRecord($level = Logger::WARNING)
|
||||||
|
{
|
||||||
|
return array(
|
||||||
|
'level' => $level,
|
||||||
|
'level_name' => Logger::getLevelName($level),
|
||||||
|
'channel' => 'log',
|
||||||
|
'Record' => 'foo',
|
||||||
|
'datetime' => new \DateTime,
|
||||||
|
'extra' => array(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user