BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/190629
Change subject: Revert "Revert "beta: switch logstash transport from redis to
syslog""
......................................................................
Revert "Revert "beta: switch logstash transport from redis to syslog""
This reverts commit 09af342722ff4776428a0f8bda378dbd54827011.
Monolog 1.12.0 now present in mediawiki/vendor
Change-Id: I9977b3071f0e9f567d02dab241777a3e073b19c6
---
M wmf-config/logging-labs.php
1 file changed, 10 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/29/190629/1
diff --git a/wmf-config/logging-labs.php b/wmf-config/logging-labs.php
index 3b954f9..60db0ce 100644
--- a/wmf-config/logging-labs.php
+++ b/wmf-config/logging-labs.php
@@ -43,24 +43,19 @@
$wgDebugLogPrefix = $randomHash . ": ";
/**
- * Create a config array for a \Monolog\Handler\RedisHandler instance.
+ * Create a config array for a MWLoggerMonologSyslogHandler instance.
* @param int $level Minimum logging level at which this handler will be
* triggered
*/
-function wmMonologRedisConfigFactory( $level ) {
- global $wmgLogstashPassword;
+function wmMonologSyslogConfigFactory( $level ) {
return array(
- 'class' => '\\Monolog\\Handler\\RedisHandler',
+ 'class' => 'MWLoggerMonologSyslogHandler',
'args' => array(
- function() use ( $wmgLogstashPassword ) {
- $redis = new Redis();
- // deployment-logstash1.eqiad.wmflabs
- $redis->connect( '10.68.16.134', 6379, .25 );
- $redis->auth( $wmgLogstashPassword );
- return $redis;
- },
- 'logstash',
- $level
+ 'mediawiki', // syslog appname
+ '10.68.16.134', // deployment-logstash1.eqiad.wmflabs
+ 10514, // logstash syslog listener port
+ LOG_USER, // syslog facility
+ $level, // minimum log level to pass to logstash
),
'formatter' => 'logstash',
);
@@ -102,7 +97,7 @@
'args' => array( $wgDebugLogFile, true ),
'formatter' => 'legacy',
),
- 'logstash' => wmMonologRedisConfigFactory(
\Monolog\Logger::DEBUG ),
+ 'logstash' => wmMonologSyslogConfigFactory(
\Monolog\Logger::DEBUG ),
),
'formatters' => array(
@@ -136,7 +131,7 @@
if ( $level !== false ) {
$logstashHandler = "filtered-{$group}";
$wmgMonologConfig['handlers'][$logstashHandler] =
- wmMonologRedisConfigFactory( $level );
+ wmMonologSyslogConfigFactory( $level );
}
if ( $sample === false ) {
--
To view, visit https://gerrit.wikimedia.org/r/190629
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9977b3071f0e9f567d02dab241777a3e073b19c6
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
