diff options
author | Matthieu Napoli <matthieu@mnapoli.fr> | 2014-12-05 00:09:07 +0300 |
---|---|---|
committer | Matthieu Napoli <matthieu@mnapoli.fr> | 2014-12-05 00:09:07 +0300 |
commit | a26cf222ff29851440d71cc63df7b3f8650100d3 (patch) | |
tree | e6845d779550511ab518c874dbb4088f3435ef27 /core/Container | |
parent | 7a9f70830a0d32fd56f381aac47d5ed64bf4ed7a (diff) |
#6622 Logger refactoring: log in CLI
- follows the verbosity level
- formatted with colors
Diffstat (limited to 'core/Container')
-rw-r--r-- | core/Container/StaticContainer.php | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/core/Container/StaticContainer.php b/core/Container/StaticContainer.php index 96a3742317..81d7eefe04 100644 --- a/core/Container/StaticContainer.php +++ b/core/Container/StaticContainer.php @@ -28,6 +28,13 @@ class StaticContainer private static $container; /** + * Should we load the CLI config. + * + * @var bool + */ + private static $cli = false; + + /** * @return Container */ public static function getContainer() @@ -66,6 +73,10 @@ class StaticContainer // Global config $builder->addDefinitions(PIWIK_USER_PATH . '/config/global.php'); + if (self::$cli) { + $builder->addDefinitions(PIWIK_USER_PATH . '/config/cli.php'); + } + // User config if (file_exists(PIWIK_USER_PATH . '/config/config.php')) { $builder->addDefinitions(PIWIK_USER_PATH . '/config/config.php'); @@ -73,4 +84,9 @@ class StaticContainer return $builder->build(); } + + public static function loadCliConfig() + { + self::$cli = true; + } } |