diff options
author | Matthieu Napoli <matthieu@mnapoli.fr> | 2015-03-26 04:03:49 +0300 |
---|---|---|
committer | Matthieu Napoli <matthieu@mnapoli.fr> | 2015-03-26 04:09:49 +0300 |
commit | c4d736682d00200305295afab5cc07ac7dc3e8bb (patch) | |
tree | b175037d0efdeac2fecc2d60212ba56b52e5f3dd /plugins/Monolog | |
parent | ac8e43b1fae6274647f1295345e63b351babf700 (diff) |
Avoid the sprintf log processor to be run if not needed and avoid to die if sprintf with an object
Diffstat (limited to 'plugins/Monolog')
-rw-r--r-- | plugins/Monolog/Processor/SprintfProcessor.php | 4 | ||||
-rw-r--r-- | plugins/Monolog/config/config.php | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/plugins/Monolog/Processor/SprintfProcessor.php b/plugins/Monolog/Processor/SprintfProcessor.php index dafa46e5ba..f06b6154de 100644 --- a/plugins/Monolog/Processor/SprintfProcessor.php +++ b/plugins/Monolog/Processor/SprintfProcessor.php @@ -18,7 +18,7 @@ class SprintfProcessor $message = $record['message']; $parameters = $record['context']; - if (is_string($message) && !empty($parameters)) { + if (is_string($message) && !empty($parameters) && strpos($message, '%') !== false) { $parameters = $this->ensureParametersAreStrings($parameters); $record['message'] = vsprintf($message, $parameters); @@ -32,6 +32,8 @@ class SprintfProcessor foreach ($parameters as &$param) { if (is_array($param)) { $param = json_encode($param); + } elseif (is_object($param)) { + $param = get_class($param); } } diff --git a/plugins/Monolog/config/config.php b/plugins/Monolog/config/config.php index b95a143c97..7005573ced 100644 --- a/plugins/Monolog/config/config.php +++ b/plugins/Monolog/config/config.php @@ -31,10 +31,10 @@ return array( }), 'log.processors' => array( + DI\link('Piwik\Plugins\Monolog\Processor\SprintfProcessor'), DI\link('Piwik\Plugins\Monolog\Processor\ClassNameProcessor'), DI\link('Piwik\Plugins\Monolog\Processor\RequestIdProcessor'), DI\link('Piwik\Plugins\Monolog\Processor\ExceptionToTextProcessor'), - DI\link('Piwik\Plugins\Monolog\Processor\SprintfProcessor'), DI\link('Monolog\Processor\PsrLogMessageProcessor'), DI\link('Piwik\Plugins\Monolog\Processor\TokenProcessor'), ), |