X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Ffilebackend%2Flockmanager%2FMemcLockManager.php;h=b8e25e72a9d18b214e3b492706e9e7d8b124ec7b;hb=4b5f75205bfb984cee46a15b9d52c1ec0f27af21;hp=9e81dbfdb992139caac92e7db9c96c443f6a101d;hpb=9f655dc36085061d8be9637cf374156694cbcd4e;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/filebackend/lockmanager/MemcLockManager.php b/includes/filebackend/lockmanager/MemcLockManager.php
index 9e81dbfdb9..b8e25e72a9 100644
--- a/includes/filebackend/lockmanager/MemcLockManager.php
+++ b/includes/filebackend/lockmanager/MemcLockManager.php
@@ -56,14 +56,15 @@ class MemcLockManager extends QuorumLockManager {
 	 * Construct a new instance from configuration.
 	 *
 	 * $config paramaters include:
-	 *   - 'lockServers'  : Associative array of server names to "<IP>:<port>" strings.
-	 *   - 'srvsByBucket' : Array of 1-16 consecutive integer keys, starting from 0,
-	 *                      each having an odd-numbered list of server names (peers) as values.
-	 *   - 'memcConfig'   : Configuration array for ObjectCache::newFromParams. [optional]
-	 *                      If set, this must use one of the memcached classes.
-	 *   - 'wikiId'       : Wiki ID string that all resources are relative to. [optional]
+	 *   - lockServers  : Associative array of server names to "<IP>:<port>" strings.
+	 *   - srvsByBucket : Array of 1-16 consecutive integer keys, starting from 0,
+	 *                    each having an odd-numbered list of server names (peers) as values.
+	 *   - memcConfig   : Configuration array for ObjectCache::newFromParams. [optional]
+	 *                    If set, this must use one of the memcached classes.
+	 *   - wikiId       : Wiki ID string that all resources are relative to. [optional]
 	 *
 	 * @param Array $config
+	 * @throws MWException
 	 */
 	public function __construct( array $config ) {
 		parent::__construct( $config );
@@ -110,7 +111,7 @@ class MemcLockManager extends QuorumLockManager {
 			foreach ( $paths as $path ) {
 				$status->fatal( 'lockmanager-fail-acquirelock', $path );
 			}
-			return;
+			return; // FIXME: Should return a Status object
 		}
 
 		// Fetch all the existing lock records...