X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Flibs%2Frdbms%2Floadbalancer%2FLoadBalancer.php;h=1be8926bfa55042bdde924fd268db5db7024c7d8;hb=0f3226654343a78c4b58ba3f1032bc031ce7b8eb;hp=36de39e0fbc3e87c73f58d195a52c863a7f9de46;hpb=21948ec459cbb99167c09b59b7296b7f5d502aa0;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancer.php b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
index 36de39e0fb..1be8926bfa 100644
--- a/includes/libs/rdbms/loadbalancer/LoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
@@ -384,9 +384,9 @@ class LoadBalancer implements ILoadBalancer {
 			throw new InvalidArgumentException( "Empty server array given to LoadBalancer" );
 		}
 
-		/** @var $i int|bool Index of selected server */
+		/** @var int|bool $i Index of selected server */
 		$i = false;
-		/** @var $laggedReplicaMode bool Whether server is considered lagged */
+		/** @var bool $laggedReplicaMode Whether server is considered lagged */
 		$laggedReplicaMode = false;
 
 		// Quickly look through the available servers for a server that meets criteria...
@@ -538,7 +538,7 @@ class LoadBalancer implements ILoadBalancer {
 	public function getAnyOpenConnection( $i ) {
 		foreach ( $this->mConns as $connsByServer ) {
 			if ( !empty( $connsByServer[$i] ) ) {
-				/** @var $serverConns IDatabase[] */
+				/** @var IDatabase[] $serverConns */
 				$serverConns = $connsByServer[$i];
 
 				return reset( $serverConns );
@@ -568,7 +568,8 @@ class LoadBalancer implements ILoadBalancer {
 			$knownReachedPos->hasReached( $this->mWaitForPos )
 		) {
 			$this->replLogger->debug( __METHOD__ .
-				": replica DB $server known to be caught up (pos >= $knownReachedPos)." );
+				': replica DB {dbserver} known to be caught up (pos >= $knownReachedPos).',
+				[ 'dbserver' => $server ] );
 			return true;
 		}
 
@@ -576,13 +577,15 @@ class LoadBalancer implements ILoadBalancer {
 		$conn = $this->getAnyOpenConnection( $index );
 		if ( !$conn ) {
 			if ( !$open ) {
-				$this->replLogger->debug( __METHOD__ . ": no connection open for $server" );
+				$this->replLogger->debug( __METHOD__ . ': no connection open for {dbserver}',
+					[ 'dbserver' => $server ] );
 
 				return false;
 			} else {
 				$conn = $this->openConnection( $index, self::DOMAIN_ANY );
 				if ( !$conn ) {
-					$this->replLogger->warning( __METHOD__ . ": failed to connect to $server" );
+					$this->replLogger->warning( __METHOD__ . ': failed to connect to {dbserver}',
+						[ 'dbserver' => $server ] );
 
 					return false;
 				}
@@ -592,7 +595,8 @@ class LoadBalancer implements ILoadBalancer {
 			}
 		}
 
-		$this->replLogger->info( __METHOD__ . ": Waiting for replica DB $server to catch up..." );
+		$this->replLogger->info( __METHOD__ . ': Waiting for replica DB {dbserver} to catch up...',
+			[ 'dbserver' => $server ] );
 		$timeout = $timeout ?: $this->mWaitTimeout;
 		$result = $conn->masterPosWait( $this->mWaitForPos, $timeout );