Gergő Tisza has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/218291

Change subject: Vagrant role for convenient enabling of PSR-3 logging
......................................................................

Vagrant role for convenient enabling of PSR-3 logging

Change-Id: I5b11aa4747b9daa8184e0bef76d2a06110facca7
---
A puppet/modules/role/files/psr3/settings.php.erb
A puppet/modules/role/manifests/psr3.pp
2 files changed, 77 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/91/218291/1

diff --git a/puppet/modules/role/files/psr3/settings.php.erb 
b/puppet/modules/role/files/psr3/settings.php.erb
new file mode 100644
index 0000000..80e4583
--- /dev/null
+++ b/puppet/modules/role/files/psr3/settings.php.erb
@@ -0,0 +1,68 @@
+// copied from the phpdoc in includes/debug/logger/MonologSpi.php
+$wgMWLoggerDefaultSpi = array(
+   'class' => '\\MediaWiki\\Logger\\MonologSpi',
+   'args' => array( array(
+       'loggers' => array(
+           '@default' => array(
+               'processors' => array( 'wiki', 'psr', 'pid', 'uid', 'web' ),
+               'handlers'   => array( 'stream' ),
+           ),
+           'runJobs' => array(
+               'processors' => array( 'wiki', 'psr', 'pid' ),
+               'handlers'   => array( 'stream' ),
+           )
+       ),
+       'processors' => array(
+           'wiki' => array(
+               'class' => '\\MediaWiki\\Logger\\Monolog\\WikiProcessor',
+           ),
+           'psr' => array(
+               'class' => '\\Monolog\\Processor\\PsrLogMessageProcessor',
+           ),
+           'pid' => array(
+               'class' => '\\Monolog\\Processor\\ProcessIdProcessor',
+           ),
+           'uid' => array(
+               'class' => '\\Monolog\\Processor\\UidProcessor',
+           ),
+           'web' => array(
+               'class' => '\\Monolog\\Processor\\WebProcessor',
+           ),
+       ),
+       'handlers' => array(
+           'stream' => array(
+               'class'     => '\\Monolog\\Handler\\StreamHandler',
+               'args'      => array( 'path/to/your.log' ),
+               'formatter' => 'line',
+           ),
+           'redis' => array(
+               'class'     => '\\Monolog\\Handler\\RedisHandler',
+               'args'      => array( function() {
+                       $redis = new Redis();
+                       $redis->connect( '127.0.0.1', 6379 );
+                       return $redis;
+                   },
+                   'logstash'
+               ),
+               'formatter' => 'logstash',
+           ),
+           'udp2log' => array(
+               'class' => '\\MediaWiki\\Logger\\Monolog\\LegacyHandler',
+               'args' => array(
+                   'udp://127.0.0.1:8420/mediawiki
+               ),
+               'formatter' => 'line',
+           ),
+       ),
+       'formatters' => array(
+           'line' => array(
+               'class' => '\\Monolog\\Formatter\\LineFormatter',
+            ),
+            'logstash' => array(
+                'class' => '\\Monolog\\Formatter\\LogstashFormatter',
+                'args'  => array( 'mediawiki', php_uname( 'n' ), null, '', 1 ),
+            ),
+       ),
+   ) ),
+ );
+
diff --git a/puppet/modules/role/manifests/psr3.pp 
b/puppet/modules/role/manifests/psr3.pp
new file mode 100644
index 0000000..6710c9e
--- /dev/null
+++ b/puppet/modules/role/manifests/psr3.pp
@@ -0,0 +1,9 @@
+# == Class: role::psr
+# Sets up PSR-3 structured logging (the way it is done on Wikimedia wikis)
+#
+class role::psr () {
+    mediawiki::settings { 'psr3':
+        priority => 1,
+        value    => template('role/psr/settings.php.erb'),
+    }
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/218291
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5b11aa4747b9daa8184e0bef76d2a06110facca7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza <gti...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to