Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordiosmosis <diosmosis@users.noreply.github.com>2019-12-10 02:52:30 +0300
committerThomas Steur <tsteur@users.noreply.github.com>2019-12-10 02:52:30 +0300
commit89007f29c299d22e7554ebdbf1567ebf60721f32 (patch)
tree0dd380409f60c8e9ef000a1a643ecd929911d240 /plugins/Monolog
parent3ac6b6936bf22f2a28a1e4bc169b73f3aa6a6870 (diff)
tracker debug fixes in CLI command + extra logs for Lock (#15197)
Diffstat (limited to 'plugins/Monolog')
-rw-r--r--plugins/Monolog/config/config.php3
-rw-r--r--plugins/Monolog/config/tracker.php10
2 files changed, 12 insertions, 1 deletions
diff --git a/plugins/Monolog/config/config.php b/plugins/Monolog/config/config.php
index b81fb089c1..7bb9ec6f0f 100644
--- a/plugins/Monolog/config/config.php
+++ b/plugins/Monolog/config/config.php
@@ -43,8 +43,9 @@ return array(
if ($writerName === 'screen'
&& \Piwik\Common::isPhpCliMode()
&& !defined('PIWIK_TEST_MODE')
+ && !\Piwik\SettingsServer::isTrackerApiRequest()
) {
- continue; // screen writer is only valid for web requests
+ continue; // screen writer is only valid for web requests (except for tracker CLI requests)
}
if (isset($classes[$writerName])) {
diff --git a/plugins/Monolog/config/tracker.php b/plugins/Monolog/config/tracker.php
index bb7820f9f1..6b5301441e 100644
--- a/plugins/Monolog/config/tracker.php
+++ b/plugins/Monolog/config/tracker.php
@@ -10,6 +10,16 @@ function isTrackerDebugEnabled(ContainerInterface $c)
return array(
+ 'ini.log.log_writers' => DI\decorate(function ($previous, ContainerInterface $c) {
+ if (isTrackerDebugEnabled($c)
+ && \Piwik\Common::isPhpCliMode()
+ ) {
+ $previous[] = 'screen';
+ $previous = array_unique($previous);
+ }
+ return $previous;
+ }),
+
'log.handler.classes' => DI\decorate(function ($previous, ContainerInterface $c) {
if (isset($previous['screen'])
&& isTrackerDebugEnabled($c)