#6622 Logger refactoring: move to PSR-3 compatibility

- keep the log message as string
- exceptions are logged in context under the "exception" key
- Piwik\Error objects are replaced by \ErrorException (logged the PSR-3 way)

1 files changed, 13 insertions, 0 deletions

diff --git a/core/Log.php b/core/Log.php
index 3f73f5dc24..8bcf91df9c 100644
--- a/core/Log.php
+++ b/core/Log.php
@@ -117,6 +117,13 @@ class Log extends Singleton
     const GET_AVAILABLE_WRITERS_EVENT = 'Log.getAvailableWriters';
 
     /**
+     * The backtrace string to use when testing.
+     *
+     * @var string
+     */
+    public static $debugBacktraceForTests;
+
+    /**
      * Singleton instance.
      *
      * @var Log
@@ -261,6 +268,12 @@ class Log extends Singleton
 
     private function doLog($level, $message, $parameters = array())
     {
+        // To ensure the compatibility with PSR-3, the message must be a string
+        if ($message instanceof \Exception) {
+            $parameters['exception'] = $message;
+            $message = $message->getMessage();
+        }
+
         // Create a record similar to Monolog to ease future transition
         $record = array(
             'message'    => $message,