From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Sat, 17 Sep 2016 22:57:15 +0000 (+0000)
Subject: Merge "Inject Profiler into Database objects"
X-Git-Tag: 1.31.0-rc.0~5506
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=1afef61fb0f13930d8c4cafd4042ef55a0581fb7;p=lhc%2Fweb%2Fwiklou.git

Merge "Inject Profiler into Database objects"
---

1afef61fb0f13930d8c4cafd4042ef55a0581fb7
diff --cc includes/db/loadbalancer/LBFactoryMW.php
index 16faeb7390,b36197a808..1063eeff94
--- a/includes/db/loadbalancer/LBFactoryMW.php
+++ b/includes/db/loadbalancer/LBFactoryMW.php
@@@ -37,11 -37,12 +37,12 @@@ abstract class LBFactoryMW extends LBFa
  	 * @TODO: inject objects via dependency framework
  	 */
  	public function __construct( array $conf ) {
 -		global $wgCommandLineMode, $wgSQLMode, $wgDBmysql5;
 +		global $wgCommandLineMode, $wgSQLMode, $wgDBmysql5, $wgDBname, $wgDBprefix;
  
  		$defaults = [
 -			'localDomain' => wfWikiID(),
 +			'localDomain' => new DatabaseDomain( $wgDBname, null, $wgDBprefix ),
  			'hostname' => wfHostname(),
+ 			'profiler' => Profiler::instance(),
  			'trxProfiler' => Profiler::instance()->getTransactionProfiler(),
  			'replLogger' => LoggerFactory::getInstance( 'DBReplication' ),
  			'queryLogger' => LoggerFactory::getInstance( 'wfLogDBError' ),