Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/323360
Change subject: Wrap SyslogHandler in WhatFailureGroupHandler in elk role ...................................................................... Wrap SyslogHandler in WhatFailureGroupHandler in elk role SyslogHandler can throw exceptions when called after it has been destructed; mirror how WMF production setup handles the issue. Also update for new coding standards for no good reason. Bug: T151428 Change-Id: I79c72cc9f0ccb723d69adef57884bc2768dad06a --- M puppet/modules/role/templates/elk/monolog.php.erb 1 file changed, 16 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant refs/changes/60/323360/1 diff --git a/puppet/modules/role/templates/elk/monolog.php.erb b/puppet/modules/role/templates/elk/monolog.php.erb index cd6d77a..1c78a74 100644 --- a/puppet/modules/role/templates/elk/monolog.php.erb +++ b/puppet/modules/role/templates/elk/monolog.php.erb @@ -3,14 +3,23 @@ $wgDebugTimestamps = false; $wgDBerrorLog = true; -$wgMWLoggerDefaultSpi['args'][0]['loggers']['@default']['handlers'][] = 'syslog'; -$wgMWLoggerDefaultSpi['args'][0]['handlers']['syslog'] = array( +$wgMWLoggerDefaultSpi['args'][0]['loggers']['@default']['handlers'][] = 'what'; +$wgMWLoggerDefaultSpi['args'][0]['handlers']['syslog'] = [ 'class' => '\\MediaWiki\\Logger\\Monolog\\SyslogHandler', - 'args' => array( 'mediawiki', '127.0.0.1', 10514 ), + 'args' => [ 'mediawiki', '127.0.0.1', 10514 ], 'formatter' => 'logstash', -); -$wgMWLoggerDefaultSpi['args'][0]['formatters']['logstash'] = array( +]; +$wgMWLoggerDefaultSpi['args'][0]['handlers']['what'] = [ + 'class' => '\\Monolog\\Handler\\WhatFailureGroupHandler', + 'args' => [ + function () { + $provider = \MediaWiki\Logger\LoggerFactory::getProvider(); + return array_map( [ $provider, 'getHandler' ], [ 'syslog' ] ); + } + ], +]; +$wgMWLoggerDefaultSpi['args'][0]['formatters']['logstash'] = [ 'class' => '\\Monolog\\Formatter\\LogstashFormatter', - 'args' => array( 'mediawiki', php_uname( 'n' ), null, '', 1 ), -); + 'args' => [ 'mediawiki', php_uname( 'n' ), null, '', 1 ], +]; -- To view, visit https://gerrit.wikimedia.org/r/323360 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I79c72cc9f0ccb723d69adef57884bc2768dad06a 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