mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-06 13:16:39 +02:00
Code Issues Releases Wiki Activity

Tweak code to allow newlines in format, refs #322

Browse Source
This commit is contained in:
Jordi Boggiano
2014-02-18 15:12:15 +01:00
parent 39a7af48f6
commit 4c74b127eb
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Monolog/Formatter/LineFormatter.php
View File

@@ -50,20 +50,16 @@ class LineFormatter extends NormalizerFormatter
$output = $this->format; $output = $this->format;
foreach ($vars['extra'] as $var => $val) { foreach ($vars['extra'] as $var => $val) {
if (false !== strpos($output, '%extra.'.$var.'%')) { if (false !== strpos($output, '%extra.'.$var.'%')) {
$output = str_replace('%extra.'.$var.'%', $this->convertToString($val), $output); $output = str_replace('%extra.'.$var.'%', $this->replaceNewlines($this->convertToString($val)), $output);
unset($vars['extra'][$var]); unset($vars['extra'][$var]);
} }
} }
foreach ($vars as $var => $val) { foreach ($vars as $var => $val) {
if (false !== strpos($output, '%'.$var.'%')) { if (false !== strpos($output, '%'.$var.'%')) {
$output = str_replace('%'.$var.'%', $this->convertToString($val), $output); $output = str_replace('%'.$var.'%', $this->replaceNewlines($this->convertToString($val)), $output);
} }
} }
if (!$this->allowInlineLineBreaks) {
$output = $this->replaceInlineLineBreaks($output);
}
return $output; return $output;
} }
@@ -106,10 +102,12 @@ class LineFormatter extends NormalizerFormatter
return str_replace('\\/', '/', @json_encode($data)); return str_replace('\\/', '/', @json_encode($data));
} }
private function replaceInlineLineBreaks($output) protected function replaceNewlines($str)
{ {
$suffix = substr($output, -1) === "\n" ? "\n" : ''; if ($this->allowInlineLineBreaks) {
return $str;
}
return trim(str_replace("\n", ' ', $output)) . $suffix; return preg_replace('{[\r\n]+}', ' ', $str);
} }
} }