mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-10-22 17:16:18 +02:00
Code Issues Releases Wiki Activity

Added the support of a logging context

Browse Source
This commit is contained in:
Christophe Coevoet
2011-06-01 00:10:38 +02:00
parent a8d4fc4a34
commit c1675c59d8
13 changed files with 74 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,7 @@ use Monolog\Logger;
*/
class LineFormatter implements FormatterInterface
{
const SIMPLE_FORMAT = "[%datetime%] %channel%.%level_name%: %message% %extra%\n";
const SIMPLE_FORMAT = "[%datetime%] %channel%.%level_name%: %message% %context% %extra%\n";
const SIMPLE_DATE = "Y-m-d H:i:s";
protected $format;
@@ -49,8 +49,10 @@ class LineFormatter implements FormatterInterface
$output = $this->format;
foreach ($vars['extra'] as $var => $val) {
$output = str_replace('%extra.'.$var.'%', $this->convertToString($val), $output);
unset($vars['extra'][$var]);
if (false !== strpos($output, '%extra.'.$var.'%')) {
$output = str_replace('%extra.'.$var.'%', $this->convertToString($val), $output);
unset($vars['extra'][$var]);
}
}
foreach ($vars as $var => $val) {
$output = str_replace('%'.$var.'%', $this->convertToString($val), $output);
@@ -75,7 +77,7 @@ class LineFormatter implements FormatterInterface
return (string) $data;
}
return json_encode($this->normalize($data));
return stripslashes(json_encode($this->normalize($data)));
}
protected function normalize($data)
@@ -94,6 +96,6 @@ class LineFormatter implements FormatterInterface
return $normalized;
}
return sprintf("[object] (%s: %s)", get_class($data), json_decode($data));
return sprintf("[object] (%s: %s)", get_class($data), json_encode($data));
}
}