From d7dbdd73354d224b47767e84b7ad73dff3c23980 Mon Sep 17 00:00:00 2001 From: Reedy Date: Wed, 16 Jan 2013 23:51:43 +0000 Subject: [PATCH] Fix mctest to work with new WMF memcached setup Change-Id: I0b366284e9c92365d4c8b8458f59d6cc25c998ed --- maintenance/mctest.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/maintenance/mctest.php b/maintenance/mctest.php index 691b832b9d..42461c5444 100644 --- a/maintenance/mctest.php +++ b/maintenance/mctest.php @@ -40,14 +40,21 @@ class mcTest extends Maintenance { } public function execute() { - global $wgMemCachedServers, $wgMemCachedTimeout; + global $wgMainCacheType, $wgMemCachedTimeout, $wgObjectCaches; $iterations = $this->getOption( 'i', 100 ); if ( $this->hasArg() ) { - $wgMemCachedServers = array( $this->getArg() ); + $servers = array( $this->getArg() ); + } elseif ( $wgMainCacheType === CACHE_MEMCACHED ) { + global $wgMemCachedServers; + $servers = $wgMemCachedServers ; + } elseif( isset( $wgObjectCaches[$wgMainCacheType] ) ) { + $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, -- 2.20.1