From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 19 Apr 2017 21:30:25 +0000 (-0700)
Subject: Remove load array indexes from LoadBalancer errors
X-Git-Tag: 1.31.0-rc.0~3461^2
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/operations/?a=commitdiff_plain;h=99fcf47b5253c3bac7c07fcc6f76c674b107d6a6;p=lhc%2Fweb%2Fwiklou.git

Remove load array indexes from LoadBalancer errors

This are not very useful and where not using SPI interpolation either.

Change-Id: Ia3a33da3a4593fbcba59b21f5b5028860752ce09
---

diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancer.php b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
index 1202831387..e2fbf72a02 100644
--- a/includes/libs/rdbms/loadbalancer/LoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
@@ -269,11 +269,11 @@ class LoadBalancer implements ILoadBalancer {
 				$host = $this->getServerName( $i );
 				if ( $lag === false && !is_infinite( $maxServerLag ) ) {
 					$this->replLogger->error(
-						"Server {host} (#$i) is not replicating?", [ 'host' => $host ] );
+						"Server {host} is not replicating?", [ 'host' => $host ] );
 					unset( $loads[$i] );
 				} elseif ( $lag > $maxServerLag ) {
 					$this->replLogger->warning(
-						"Server {host} (#$i) has {lag} seconds of lag (>= {maxlag})",
+						"Server {host} has {lag} seconds of lag (>= {maxlag})",
 						[ 'host' => $host, 'lag' => $lag, 'maxlag' => $maxServerLag ]
 					);
 					unset( $loads[$i] );