From: Tim Starling <tstarling@wikimedia.org>
Date: Fri, 27 Apr 2012 04:51:52 +0000 (+1000)
Subject: In mctest.php, use the configured timeout instead of the default
X-Git-Tag: 1.31.0-rc.0~23802
X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=8685e3adec3f405e7790bf24bc99199ec66b6294;p=lhc%2Fweb%2Fwiklou.git

In mctest.php, use the configured timeout instead of the default

Change-Id: Ia003c7f96cd0de91db57ec83036493e4bb995ee7
---

diff --git a/maintenance/mctest.php b/maintenance/mctest.php
index 359cd24831..088eaa34b1 100644
--- a/maintenance/mctest.php
+++ b/maintenance/mctest.php
@@ -33,7 +33,7 @@ class mcTest extends Maintenance {
 	}
 
 	public function execute() {
-		global $wgMemCachedServers;
+		global $wgMemCachedServers, $wgMemCachedTimeout;
 
 		$iterations = $this->getOption( 'i', 100 );
 		if ( $this->hasArg() ) {
@@ -42,7 +42,10 @@ class mcTest extends Maintenance {
 
 		foreach ( $wgMemCachedServers as $server ) {
 			$this->output( $server . " ", $server );
-			$mcc = new MemCachedClientforWiki( array( 'persistant' => true ) );
+			$mcc = new MemCachedClientforWiki( array(
+				'persistant' => true,
+				'timeout' => $wgMemCachedTimeout
+			) );
 			$mcc->set_servers( array( $server ) );
 			$set = 0;
 			$incr = 0;