From: Aaron Schulz <aschulz@wikimedia.org>
Date: Thu, 21 May 2015 03:01:52 +0000 (-0700)
Subject: Made LoadBalancer debug log entries use "localhost" placeholder
X-Git-Tag: 1.31.0-rc.0~11214^2
X-Git-Url: http://git.cyclocoop.org/%22%20%20.%20generer_url_ecrire%28%22mots_tous%22%29%20.%20%22?a=commitdiff_plain;h=4ab579e066e0e050f25a528d2338a17843fd260a;p=lhc%2Fweb%2Fwiklou.git

Made LoadBalancer debug log entries use "localhost" placeholder

* If $wgDBserver is empty, getServerName() now gives localhost.
  A few other bits use this method, which should be fine.

Change-Id: I44b0c1ed31c854990c0e7d81a710f456907b8081
---

diff --git a/includes/db/LoadBalancer.php b/includes/db/LoadBalancer.php
index 2ea2487501..99c9a14293 100644
--- a/includes/db/LoadBalancer.php
+++ b/includes/db/LoadBalancer.php
@@ -291,8 +291,8 @@ class LoadBalancer {
 				return false;
 			}
 
-			wfDebugLog( 'connect', __METHOD__ .
-				": Using reader #$i: {$this->mServers[$i]['host']}..." );
+			$serverName = $this->getServerName( $i );
+			wfDebugLog( 'connect', __METHOD__ . ": Using reader #$i: $serverName..." );
 
 			$conn = $this->openConnection( $i, $wiki );
 			if ( !$conn ) {
@@ -462,7 +462,7 @@ class LoadBalancer {
 
 		if ( $result == -1 || is_null( $result ) ) {
 			# Timed out waiting for slave, use master instead
-			$server = $this->mServers[$index]['host'];
+			$server = $server = $this->getServerName( $index );
 			$msg = __METHOD__ . ": Timed out waiting on $server pos {$this->mWaitForPos}";
 			wfDebug( "$msg\n" );
 			wfDebugLog( 'DBPerformance', "$msg:\n" . wfBacktrace( true ) );
@@ -660,11 +660,12 @@ class LoadBalancer {
 			$server = $this->mServers[$i];
 			$server['serverIndex'] = $i;
 			$conn = $this->reallyOpenConnection( $server, false );
+			$serverName = $this->getServerName( $i );
 			if ( $conn->isOpen() ) {
-				wfDebug( "Connected to database $i at {$this->mServers[$i]['host']}\n" );
+				wfDebug( "Connected to database $i at $serverName\n" );
 				$this->mConns['local'][$i][0] = $conn;
 			} else {
-				wfDebug( "Failed to connect to database $i at {$this->mServers[$i]['host']}\n" );
+				wfDebug( "Failed to connect to database $i at $serverName\n" );
 				$this->mErrorConnection = $conn;
 				$conn = false;
 			}
@@ -888,12 +889,14 @@ class LoadBalancer {
 	 */
 	public function getServerName( $i ) {
 		if ( isset( $this->mServers[$i]['hostName'] ) ) {
-			return $this->mServers[$i]['hostName'];
+			$name = $this->mServers[$i]['hostName'];
 		} elseif ( isset( $this->mServers[$i]['host'] ) ) {
-			return $this->mServers[$i]['host'];
+			$name = $this->mServers[$i]['host'];
 		} else {
-			return '';
+			$name = '';
 		}
+
+		return ( $name != '' ) ? $name : 'localhost';
 	}
 
 	/**