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

Moved the use of the default formatter to the getter to keep the code DRY

Browse Source
This commit is contained in:
Christophe Coevoet
2011-05-08 16:34:56 +02:00
parent c33eb7b032
commit 6aebccf34c
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Monolog/Handler/AbstractHandler.php
View File

@@ -62,10 +62,7 @@ abstract class AbstractHandler implements HandlerInterface
$record = $this->processRecord($record); $record = $this->processRecord($record);
if (!$this->formatter) { $record['message'] = $this->getFormatter()->format($record);
$this->formatter = $this->getDefaultFormatter();
}
$record['message'] = $this->formatter->format($record);
$this->write($record); $this->write($record);
@@ -120,6 +117,10 @@ abstract class AbstractHandler implements HandlerInterface
*/ */
public function getFormatter() public function getFormatter()
{ {
if (!$this->formatter) {
$this->formatter = $this->getDefaultFormatter();
}
return $this->formatter; return $this->formatter;
} }

5
src/Monolog/Handler/MailHandler.php
View File

@@ -33,10 +33,7 @@ abstract class MailHandler extends AbstractHandler
} }
if (!empty($messages)) { if (!empty($messages)) {
if (!$this->formatter) { $this->send($this->getFormatter()->formatBatch($messages));
$this->formatter = $this->getDefaultFormatter();
}
$this->send($this->formatter->formatBatch($messages));
} }
} }