Move RedisConnectionPool to /libs/redis

Change-Id: Ied4a85d7172ab76b90f6d9ce4d47a83c3fd7d111

2 files changed, 12 insertions, 3 deletions

diff --git a/includes/filebackend/lockmanager/LockManagerGroup.php b/includes/filebackend/lockmanager/LockManagerGroup.php
index 9ad2faf251da..1e66e6e011f5 100644
--- a/includes/filebackend/lockmanager/LockManagerGroup.php
+++ b/includes/filebackend/lockmanager/LockManagerGroup.php
@@ -21,6 +21,7 @@
  * @ingroup LockManager
  */
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Logger\LoggerFactory;
 
 /**
  * Class to handle file lock manager registration
@@ -124,6 +125,8 @@ class LockManagerGroup {
 				$config['dbServers']['localDBMaster'] = $dbw;
 				$config['srvCache'] = ObjectCache::getLocalServerInstance( 'hash' );
 			}
+			$config['logger'] = LoggerFactory::getInstance( 'LockManager' );
+
 			$this->managers[$name]['instance'] = new $class( $config );
 		}
 
diff --git a/includes/filebackend/lockmanager/RedisLockManager.php b/includes/filebackend/lockmanager/RedisLockManager.php
index 6fd819d637c8..267aecead1ed 100644
--- a/includes/filebackend/lockmanager/RedisLockManager.php
+++ b/includes/filebackend/lockmanager/RedisLockManager.php
@@ -20,6 +20,7 @@
  * @file
  * @ingroup LockManager
  */
+use Psr\Log\LoggerInterface;
 
 /**
  * Manage locks using redis servers.
@@ -51,6 +52,8 @@ class RedisLockManager extends QuorumLockManager {
 	/** @var array Map server names to hostname/IP and port numbers */
 	protected $lockServers = [];
 
+	/** @var LoggerInterface */
+	protected $logger;
 	/** @var string Random UUID */
 	protected $session = '';
 
@@ -76,6 +79,7 @@ class RedisLockManager extends QuorumLockManager {
 		$this->redisPool = RedisConnectionPool::singleton( $config['redisConfig'] );
 
 		$this->session = wfRandomString( 32 );
+		$this->logger = \MediaWiki\Logger\LoggerFactory::getInstance( 'redis' );
 	}
 
 	protected function getLocksOnServer( $lockSrv, array $pathsByType ) {
@@ -84,7 +88,7 @@ class RedisLockManager extends QuorumLockManager {
 		$pathList = call_user_func_array( 'array_merge', array_values( $pathsByType ) );
 
 		$server = $this->lockServers[$lockSrv];
-		$conn = $this->redisPool->getConnection( $server );
+		$conn = $this->redisPool->getConnection( $server, $this->logger );
 		if ( !$conn ) {
 			foreach ( $pathList as $path ) {
 				$status->fatal( 'lockmanager-fail-acquirelock', $path );
@@ -177,7 +181,7 @@ LUA;
 		$pathList = call_user_func_array( 'array_merge', array_values( $pathsByType ) );
 
 		$server = $this->lockServers[$lockSrv];
-		$conn = $this->redisPool->getConnection( $server );
+		$conn = $this->redisPool->getConnection( $server, $this->logger );
 		if ( !$conn ) {
 			foreach ( $pathList as $path ) {
 				$status->fatal( 'lockmanager-fail-releaselock', $path );
@@ -246,7 +250,9 @@ LUA;
 	}
 
 	protected function isServerUp( $lockSrv ) {
-		return (bool)$this->redisPool->getConnection( $this->lockServers[$lockSrv] );
+		$conn = $this->redisPool->getConnection( $this->lockServers[$lockSrv], $this->logger );
+
+		return (bool)$conn;
 	}
 
 	/**