Merge "Added a separate error message for mkdir failures"

[lhc/web/wiklou.git] / includes / libs / lockmanager / DBLockManager.php

diff --git a/includes/libs/lockmanager/DBLockManager.php b/includes/libs/lockmanager/DBLockManager.php
index c36ff48..26e25f9 100644 (file)
--- a/includes/libs/lockmanager/DBLockManager.php
+++ b/includes/libs/lockmanager/DBLockManager.php
@@ -21,6 +21,10 @@
  * @ingroup LockManager
  */
 
+use Wikimedia\Rdbms\Database;
+use Wikimedia\Rdbms\IDatabase;
+use Wikimedia\Rdbms\DBError;
+
 /**
  * Version of LockManager based on using named/row DB locks.
  *
@@ -43,8 +47,6 @@ abstract class DBLockManager extends QuorumLockManager {
 
        protected $lockExpiry; // integer number of seconds
        protected $safeDelay; // integer number of seconds
-
-       protected $session = 0; // random integer
        /** @var IDatabase[] Map Database connections (DB name => Database) */
        protected $conns = [];
 
@@ -60,7 +62,7 @@ abstract class DBLockManager extends QuorumLockManager {
         *                     - user        : DB user
         *                     - password    : DB user password
         *                     - tablePrefix : DB table prefix
-        *                     - flags       : DB flags (see DatabaseBase)
+        *                     - flags       : DB flags; bitfield of IDatabase::DBO_* constants
         *   - dbsByBucket : Array of 1-16 consecutive integer keys, starting from 0,
         *                   each having an odd-numbered list of DB names (peers) as values.
         *   - lockExpiry  : Lock timeout (seconds) for dropped connections. [optional]
@@ -91,12 +93,6 @@ abstract class DBLockManager extends QuorumLockManager {
                $this->statusCache = isset( $config['srvCache'] )
                        ? $config['srvCache']
                        : new HashBagOStuff();
-
-               $random = [];
-               for ( $i = 1; $i <= 5; ++$i ) {
-                       $random[] = mt_rand( 0, 0xFFFFFFF );
-               }
-               $this->session = substr( md5( implode( '-', $random ) ), 0, 31 );
        }
 
        /**
@@ -156,7 +152,7 @@ abstract class DBLockManager extends QuorumLockManager {
                        } elseif ( is_array( $this->dbServers[$lockDb] ) ) {
                                // Parameters to construct a new database connection
                                $config = $this->dbServers[$lockDb];
-                               $db = DatabaseBase::factory( $config['type'], $config );
+                               $db = Database::factory( $config['type'], $config );
                        } else {
                                throw new UnexpectedValueException( "No server called '$lockDb'." );
                        }