From: Aaron Schulz <aschulz@wikimedia.org>
Date: Tue, 20 Sep 2016 18:06:59 +0000 (-0700)
Subject: Add debugging logging to LoadBalancer connection closes
X-Git-Tag: 1.31.0-rc.0~5456
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=e5b061d6b66ff8d2820abade8c85090ed848491b;p=lhc%2Fweb%2Fwiklou.git

Add debugging logging to LoadBalancer connection closes

This matches the logging used for opening new connections and can be
useful for seeing connection leakage.

Change-Id: I8d24d059062f3b698e64751b46542eb1fa78bb36
---

diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancer.php b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
index c07d38fdbf..791e5ad5ff 100644
--- a/includes/libs/rdbms/loadbalancer/LoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
@@ -937,6 +937,8 @@ class LoadBalancer implements ILoadBalancer {
 
 	public function closeAll() {
 		$this->forEachOpenConnection( function ( IDatabase $conn ) {
+			$host = $conn->getServer();
+			$this->connLogger->debug( "Closing connection to database '$host'." );
 			$conn->close();
 		} );
 
@@ -957,6 +959,8 @@ class LoadBalancer implements ILoadBalancer {
 
 			foreach ( $connsByServer[$serverIndex] as $i => $trackedConn ) {
 				if ( $conn === $trackedConn ) {
+					$host = $this->getServerName( $i );
+					$this->connLogger->debug( "Closing connection to database $i at '$host'." );
 					unset( $this->mConns[$type][$serverIndex][$i] );
 					--$this->connsOpened;
 					break 2;