use monolog in tracker

2 files changed, 26 insertions, 7 deletions

diff --git a/plugins/Monolog/config/config.php b/plugins/Monolog/config/config.php
index 22cf7debee..5a9b2baf5c 100644
--- a/plugins/Monolog/config/config.php
+++ b/plugins/Monolog/config/config.php
@@ -11,17 +11,24 @@ return array(
 
     'Psr\Log\LoggerInterface' => DI\get('Monolog\Logger'),
 
+    'log.handler.classes' => DI\factory(function (ContainerInterface $c) {
+        $classes = array(
+            'file'     => 'Piwik\Plugins\Monolog\Handler\FileHandler',
+            'screen'   => 'Piwik\Plugins\Monolog\Handler\WebNotificationHandler',
+            'database' => 'Piwik\Plugins\Monolog\Handler\DatabaseHandler',
+        );
+
+        return $classes;
+    }),
     'log.handlers' => DI\factory(function (ContainerInterface $c) {
         if ($c->has('ini.log.log_writers')) {
             $writerNames = $c->get('ini.log.log_writers');
         } else {
             return array();
         }
-        $classes = array(
-            'file'     => 'Piwik\Plugins\Monolog\Handler\FileHandler',
-            'screen'   => 'Piwik\Plugins\Monolog\Handler\WebNotificationHandler',
-            'database' => 'Piwik\Plugins\Monolog\Handler\DatabaseHandler',
-        );
+
+        $classes = $c->get('log.handler.classes');
+
         $writerNames = array_map('trim', $writerNames);
         $writers = array();
         foreach ($writerNames as $writerName) {
diff --git a/plugins/Monolog/config/tracker.php b/plugins/Monolog/config/tracker.php
index c1a19a6618..a1220a7682 100644
--- a/plugins/Monolog/config/tracker.php
+++ b/plugins/Monolog/config/tracker.php
@@ -6,11 +6,23 @@ return array(
 
     'Psr\Log\LoggerInterface' => function (ContainerInterface $c) {
         $trackerDebug = $c->get("ini.Tracker.debug");
-        if ($trackerDebug == 1) {
+        if ($trackerDebug == 1 || $GLOBALS['PIWIK_TRACKER_DEBUG']) {
             return $c->get('Monolog\Logger');
         } else {
             return new \Psr\Log\NullLogger();
         }
-    }
+    },
+
+    'log.handler.classes' => DI\decorate(function ($previous) {
+        if (isset($previous['screen'])) {
+            $previous['screen'] = 'Piwik\Plugins\Monolog\Handler\EchoHandler';
+        }
+
+        return $previous;
+    }),
+
+    'log.level' => DI\factory(function (ContainerInterface $c) {
+        return \Monolog\Logger::DEBUG;
+    })
 
 );