1
0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-02 03:10:15 +02:00

Override getDefaultFormatter instead of creating a formatter with 'new' in method 'write'. Using levelMap again. Refactored test.

This commit is contained in:
ChristianB
2013-01-31 07:22:52 +01:00
parent b4b2d91c67
commit a2162c1787
2 changed files with 23 additions and 3 deletions

View File

@@ -61,9 +61,9 @@ class ZendMonitorHandler extends AbstractProcessingHandler
protected function write(array $record) protected function write(array $record)
{ {
if ($this->isZendServer()) { if ($this->isZendServer()) {
$formatter = new NormalizerFormatter(); $formatter = $this->getDefaultFormatter();
$record = $formatter->format($record); $record = $formatter->format($record);
$this->writeZendMonitorCustomEvent($record['level'], $record['message']); $this->writeZendMonitorCustomEvent($this->levelMap[$record['level']], $record['message']);
} }
} }
@@ -78,6 +78,24 @@ class ZendMonitorHandler extends AbstractProcessingHandler
zend_monitor_custom_event($level, $message); zend_monitor_custom_event($level, $message);
} }
/**
* {@inheritdoc}
*/
public function getDefaultFormatter()
{
return new NormalizerFormatter();
}
/**
* Get the level map
*
* @return array
*/
public function getLevelMap()
{
return $this->levelMap;
}
/** /**
* Is Zend Server? * Is Zend Server?
* *

View File

@@ -45,9 +45,11 @@ class ZendMonitorHandlerTest extends TestCase
->setMethods(array('writeZendMonitorCustomEvent')) ->setMethods(array('writeZendMonitorCustomEvent'))
->getMock(); ->getMock();
$levelMap = $zendMonitor->getLevelMap();
$zendMonitor->expects($this->once()) $zendMonitor->expects($this->once())
->method('writeZendMonitorCustomEvent') ->method('writeZendMonitorCustomEvent')
->with($record['level'], $record['message']); ->with($levelMap[$record['level']], $record['message']);
$zendMonitor->handle($record); $zendMonitor->handle($record);
} }