summaryrefslogtreecommitdiff
path: root/maintenance/mctest.php
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2013-08-12 09:28:15 +0200
committerPierre Schmitz <pierre@archlinux.de>2013-08-12 09:28:15 +0200
commit08aa4418c30cfc18ccc69a0f0f9cb9e17be6c196 (patch)
tree577a29fb579188d16003a209ce2a2e9c5b0aa2bd /maintenance/mctest.php
parentcacc939b34e315b85e2d72997811eb6677996cc1 (diff)
Update to MediaWiki 1.21.1
Diffstat (limited to 'maintenance/mctest.php')
-rw-r--r--maintenance/mctest.php22
1 files changed, 18 insertions, 4 deletions
diff --git a/maintenance/mctest.php b/maintenance/mctest.php
index 691b832b..469feca2 100644
--- a/maintenance/mctest.php
+++ b/maintenance/mctest.php
@@ -36,18 +36,32 @@ class mcTest extends Maintenance {
$this->mDescription = "Makes several 'set', 'incr' and 'get' requests on every"
. " memcached server and shows a report";
$this->addOption( 'i', 'Number of iterations', false, true );
+ $this->addOption( 'cache', 'Use servers from this $wgObjectCaches store', false, true );
$this->addArg( 'server[:port]', 'Memcached server to test, with optional port', false );
}
public function execute() {
- global $wgMemCachedServers, $wgMemCachedTimeout;
+ global $wgMainCacheType, $wgMemCachedTimeout, $wgObjectCaches;
+ $cache = $this->getOption( 'cache' );
$iterations = $this->getOption( 'i', 100 );
- if ( $this->hasArg() ) {
- $wgMemCachedServers = array( $this->getArg() );
+ if ( $cache ) {
+ if ( !isset( $wgObjectCaches[$cache] ) ) {
+ $this->error( "MediaWiki isn't configured with a cache named '$cache'", 1 );
+ }
+ $servers = $wgObjectCaches[$cache]['servers'];
+ } elseif ( $this->hasArg() ) {
+ $servers = array( $this->getArg() );
+ } elseif ( $wgMainCacheType === CACHE_MEMCACHED ) {
+ global $wgMemCachedServers;
+ $servers = $wgMemCachedServers ;
+ } elseif ( isset( $wgObjectCaches[$wgMainCacheType]['servers'] ) ) {
+ $servers = $wgObjectCaches[$wgMainCacheType]['servers'];
+ } else {
+ $this->error( "MediaWiki isn't configured for Memcached usage", 1 );
}
- foreach ( $wgMemCachedServers as $server ) {
+ foreach ( $servers as $server ) {
$this->output( $server . " ", $server );
$mcc = new MemCachedClientforWiki( array(
'persistant' => true,