Merge branch 'master' into config_step_2

Conflicts:
	core/Console.php
	piwik.php

3 files changed, 48 insertions, 1 deletions

diff --git a/plugins/Monolog/config/cli.php b/plugins/Monolog/config/cli.php
new file mode 100644
index 0000000000..04bf1cdbca
--- /dev/null
+++ b/plugins/Monolog/config/cli.php
@@ -0,0 +1,29 @@
+<?php
+
+use Interop\Container\ContainerInterface;
+use Monolog\Logger;
+use Symfony\Bridge\Monolog\Formatter\ConsoleFormatter;
+use Symfony\Bridge\Monolog\Handler\ConsoleHandler;
+use Symfony\Component\Console\Output\OutputInterface;
+
+return array(
+
+    // Log
+    'log.handlers' => array(
+        DI\get('Symfony\Bridge\Monolog\Handler\ConsoleHandler'),
+    ),
+    'Symfony\Bridge\Monolog\Handler\ConsoleHandler' => function (ContainerInterface $c) {
+        // Override the default verbosity map to make it more verbose by default
+        $verbosityMap = array(
+            OutputInterface::VERBOSITY_NORMAL => Logger::INFO,
+            OutputInterface::VERBOSITY_VERBOSE => Logger::DEBUG,
+            OutputInterface::VERBOSITY_VERY_VERBOSE => Logger::DEBUG,
+            OutputInterface::VERBOSITY_DEBUG => Logger::DEBUG,
+        );
+        $handler = new ConsoleHandler(null, true, $verbosityMap);
+        $handler->setFormatter(new ConsoleFormatter($c->get('log.console.format'), null, true, true));
+        return $handler;
+    },
+    'log.console.format' => '%start_tag%%level_name% [%datetime%]%end_tag% %message%' . PHP_EOL,
+
+);
diff --git a/plugins/Monolog/config/config.php b/plugins/Monolog/config/config.php
index 3fd3fcf63a..22cf7debee 100644
--- a/plugins/Monolog/config/config.php
+++ b/plugins/Monolog/config/config.php
@@ -6,9 +6,11 @@ use Piwik\Log;
 
 return array(
 
-    'Psr\Log\LoggerInterface' => DI\object('Monolog\Logger')
+    'Monolog\Logger' => DI\object('Monolog\Logger')
         ->constructor('piwik', DI\get('log.handlers'), DI\get('log.processors')),
 
+    'Psr\Log\LoggerInterface' => DI\get('Monolog\Logger'),
+
     'log.handlers' => DI\factory(function (ContainerInterface $c) {
         if ($c->has('ini.log.log_writers')) {
             $writerNames = $c->get('ini.log.log_writers');
diff --git a/plugins/Monolog/config/tracker.php b/plugins/Monolog/config/tracker.php
new file mode 100644
index 0000000000..c1a19a6618
--- /dev/null
+++ b/plugins/Monolog/config/tracker.php
@@ -0,0 +1,16 @@
+<?php
+
+use Interop\Container\ContainerInterface;
+
+return array(
+
+    'Psr\Log\LoggerInterface' => function (ContainerInterface $c) {
+        $trackerDebug = $c->get("ini.Tracker.debug");
+        if ($trackerDebug == 1) {
+            return $c->get('Monolog\Logger');
+        } else {
+            return new \Psr\Log\NullLogger();
+        }
+    }
+
+);