From: Alexandre Emsenhuber <ialex.wiki@gmail.com>
Date: Sun, 2 Sep 2012 20:28:13 +0000 (+0200)
Subject: Remove some debug output when opening a new database connection
X-Git-Tag: 1.31.0-rc.0~22347
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=7525820cb76d5a0a31058dd57334ca521280a703;p=lhc%2Fweb%2Fwiklou.git

Remove some debug output when opening a new database connection

Simplified the messages to avoid duplicates.

Change-Id: Ibcccc98bc18bdd0e0b876d9ad97f281c643eeabf
---

diff --git a/includes/db/LoadBalancer.php b/includes/db/LoadBalancer.php
index c40ac0c917..df36bf8f2d 100644
--- a/includes/db/LoadBalancer.php
+++ b/includes/db/LoadBalancer.php
@@ -585,6 +585,7 @@ class LoadBalancer {
 			$server['serverIndex'] = $i;
 			$conn = $this->reallyOpenConnection( $server, false );
 			if ( $conn->isOpen() ) {
+				wfDebug( "Connected to database $i at {$this->mServers[$i]['host']}\n" );
 				$this->mConns['local'][$i][0] = $conn;
 			} else {
 				wfDebug( "Failed to connect to database $i at {$this->mServers[$i]['host']}\n" );
@@ -706,7 +707,6 @@ class LoadBalancer {
 		}
 
 		# Create object
-		wfDebug( "Connecting to $host $dbname...\n" );
 		try {
 			$db = DatabaseBase::factory( $server['type'], $server );
 		} catch ( DBConnectionError $e ) {
@@ -715,11 +715,6 @@ class LoadBalancer {
 			$db = $e->db;
 		}
 
-		if ( $db->isOpen() ) {
-			wfDebug( "Connected to $host $dbname.\n" );
-		} else {
-			wfDebug( "Connection failed to $host $dbname.\n" );
-		}
 		$db->setLBInfo( $server );
 		if ( isset( $server['fakeSlaveLag'] ) ) {
 			$db->setFakeSlaveLag( $server['fakeSlaveLag'] );