Aaron Schulz has uploaded a new change for review. https://gerrit.wikimedia.org/r/53774
Change subject: Set job queue aggregator to redis. ...................................................................... Set job queue aggregator to redis. Change-Id: I6b99685b70d1b329ed3ba7effdfa447fd8ea1443 --- M .gitignore M wmf-config/CommonSettings.php A wmf-config/jobqueue-eqiad.php A wmf-config/jobqueue-pmtpa.php 4 files changed, 27 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/74/53774/1 diff --git a/.gitignore b/.gitignore index 53edc0e..e0e117b 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ # Operating system stuff ## Mac OS X .DS_Store +/nbproject/private/ \ No newline at end of file diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index 56a7ae8..4d92fc4 100644 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -1168,8 +1168,12 @@ # e-mailing password based on e-mail address (bug 34386) $wgPasswordResetRoutes['email'] = true; +# Cluster-dependent files for file backend require( getRealmSpecificFilename( "$wmfConfigDir/filebackend.php" ) ); +# Cluster-dependent files for job queue and job queue aggregator +require( getRealmSpecificFilename( "$wmfConfigDir/jobqueue.php" ) ); + if( $wgDBname != 'commonswiki' ) { $wgDefaultUserOptions['watchcreations'] = 1; } diff --git a/wmf-config/jobqueue-eqiad.php b/wmf-config/jobqueue-eqiad.php new file mode 100644 index 0000000..a6ce6a8 --- /dev/null +++ b/wmf-config/jobqueue-eqiad.php @@ -0,0 +1,11 @@ +<?php +# WARNING: This file is publically viewable on the web. Do not put private data here. +$wgJobQueueAggregator = array( + 'class' => 'JobQueueAggregatorRedis', + 'redisServer' => '10.64.0.180', # mc1001 + 'redisConfig' => array( + 'connectTimeout' => 1, + 'serializer' => 'igbinary' + ) +); +# vim: set sts=4 sw=4 et : diff --git a/wmf-config/jobqueue-pmtpa.php b/wmf-config/jobqueue-pmtpa.php new file mode 100644 index 0000000..3e10451 --- /dev/null +++ b/wmf-config/jobqueue-pmtpa.php @@ -0,0 +1,11 @@ +<?php +# WARNING: This file is publically viewable on the web. Do not put private data here. +$wgJobQueueAggregator = array( + 'class' => 'JobQueueAggregatorRedis', + 'redisServer' => '10.0.12.1', # mc1 + 'redisConfig' => array( + 'connectTimeout' => 1, + 'serializer' => 'igbinary' + ) +); +# vim: set sts=4 sw=4 et : -- To view, visit https://gerrit.wikimedia.org/r/53774 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6b99685b70d1b329ed3ba7effdfa447fd8ea1443 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits