X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=maintenance%2Fmctest.php;h=375c80d5187344b01ffadc6538eda694830464b0;hb=808002979a816c61a4bf8f9024d010f123358890;hp=42461c5444e0c371ddd169316749cd8f1cb08f90;hpb=cfdf23952dac41ac78dd97e670295098348604cd;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/mctest.php b/maintenance/mctest.php
index 42461c5444..375c80d518 100644
--- a/maintenance/mctest.php
+++ b/maintenance/mctest.php
@@ -34,21 +34,28 @@ class mcTest extends Maintenance {
 	public function __construct() {
 		parent::__construct();
 		$this->mDescription = "Makes several 'set', 'incr' and 'get' requests on every"
-							  . " memcached server and shows a report";
+			. " 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 $wgMainCacheType, $wgMemCachedTimeout, $wgObjectCaches;
 
+		$cache = $this->getOption( 'cache' );
 		$iterations = $this->getOption( 'i', 100 );
-		if ( $this->hasArg() ) {
+		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 = $wgMemCachedServers;
+		} elseif ( isset( $wgObjectCaches[$wgMainCacheType]['servers'] ) ) {
 			$servers = $wgObjectCaches[$wgMainCacheType]['servers'];
 		} else {
 			$this->error( "MediaWiki isn't configured for Memcached usage", 1 );
@@ -98,4 +105,4 @@ class mcTest extends Maintenance {
 }
 
 $maintClass = "mcTest";
-require_once( RUN_MAINTENANCE_IF_MAIN );
+require_once RUN_MAINTENANCE_IF_MAIN;