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

Rename to GroupHandler, remove callback support, add couple of tests, try 2

Browse Source
This commit is contained in:
lenar
2011-05-10 18:07:42 +03:00
parent 0eb5896c5b
commit b6949fbf8f
2 changed files with 7 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Monolog/Handler/GroupHandler.php
View File

@@ -18,9 +18,8 @@ use Monolog\Logger;
* *
* @author Lenar Lõhmus <lenar@city.ee> * @author Lenar Lõhmus <lenar@city.ee>
*/ */
class ForwarderHandler extends AbstractHandler class GroupHandler extends AbstractHandler
{ {
private $handlersInitialized;
protected $handlers; protected $handlers;
/** /**
@@ -29,7 +28,6 @@ class ForwarderHandler extends AbstractHandler
*/ */
public function __construct(array $handlers, $bubble = false) public function __construct(array $handlers, $bubble = false)
{ {
$this->handlersInitialized = false;
$this->handlers = $handlers; $this->handlers = $handlers;
$this->bubble = $bubble; $this->bubble = $bubble;
} }
@@ -39,8 +37,6 @@ class ForwarderHandler extends AbstractHandler
*/ */
public function handle(array $record) public function handle(array $record)
{ {
$this->handlersInitialized || $this->initializeHandlers();
foreach ($this->handlers as $handler) { foreach ($this->handlers as $handler) {
$handler->handle($record); $handler->handle($record);
} }
@@ -52,8 +48,6 @@ class ForwarderHandler extends AbstractHandler
*/ */
public function handleBatch(array $records) public function handleBatch(array $records)
{ {
$this->handlersInitialized || $this->initializeHandlers();
foreach ($this->handlers as $handler) { foreach ($this->handlers as $handler) {
$handler->handleBatch($records); $handler->handleBatch($records);
} }
@@ -64,19 +58,6 @@ class ForwarderHandler extends AbstractHandler
*/ */
protected function write(array $record) protected function write(array $record)
{ {
throw new \BadMethodCallException('This method should not be called directly on the ForwarderHandler.'); throw new \BadMethodCallException('This method should not be called directly on the GroupHandler.');
}
private function initializeHandlers()
{
foreach ($this->handlers as &$handler) {
if (!$handler instanceof HandlerInterface) {
$handler = call_user_func($handler, $record, $this);
if (!$handler instanceof HandlerInterface) {
throw new \RuntimeException("The factory callback should return a HandlerInterface");
}
}
}
$this->handlersInitialized = true;
} }
} }

10
tests/Monolog/Handler/GroupHandlerTest.php
View File

@@ -14,12 +14,12 @@ namespace Monolog\Handler;
use Monolog\TestCase; use Monolog\TestCase;
use Monolog\Logger; use Monolog\Logger;
class ForwarderHandlerTest extends TestCase class GroupHandlerTest extends TestCase
{ {
public function testHandleForward() public function testHandle()
{ {
$testHandlers = array(new TestHandler(), new TestHandler()); $testHandlers = array(new TestHandler(), new TestHandler());
$handler = new ForwarderHandler($testHandlers); $handler = new GroupHandler($testHandlers);
$handler->handle($this->getRecord(Logger::DEBUG)); $handler->handle($this->getRecord(Logger::DEBUG));
$handler->handle($this->getRecord(Logger::INFO)); $handler->handle($this->getRecord(Logger::INFO));
foreach ($testHandlers as $test) { foreach ($testHandlers as $test) {
@@ -29,10 +29,10 @@ class ForwarderHandlerTest extends TestCase
} }
} }
public function testHandleBatchForward() public function testHandleBatch()
{ {
$testHandlers = array(new TestHandler(), new TestHandler()); $testHandlers = array(new TestHandler(), new TestHandler());
$handler = new ForwarderHandler($testHandlers); $handler = new GroupHandler($testHandlers);
$handler->handleBatch(array($this->getRecord(Logger::DEBUG), $this->getRecord(Logger::INFO))); $handler->handleBatch(array($this->getRecord(Logger::DEBUG), $this->getRecord(Logger::INFO)));
foreach ($testHandlers as $test) { foreach ($testHandlers as $test) {
$this->assertTrue($test->hasDebugRecords()); $this->assertTrue($test->hasDebugRecords());