jenkins-bot has submitted this change and it was merged.
Change subject: Fix "externalCluster" LBFactorySimple setting in LBFactoryMW
......................................................................
Fix "externalCluster" LBFactorySimple setting in LBFactoryMW
Fixes regression from d175b391ae2a
Change-Id: I4bbc875e2fcd021e342959a37475ec356cb58cce
---
M includes/db/loadbalancer/LBFactoryMW.php
M includes/libs/rdbms/lbfactory/LBFactorySimple.php
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/db/loadbalancer/LBFactoryMW.php
b/includes/db/loadbalancer/LBFactoryMW.php
index e943a8a..f8647a3 100644
--- a/includes/db/loadbalancer/LBFactoryMW.php
+++ b/includes/db/loadbalancer/LBFactoryMW.php
@@ -94,8 +94,8 @@
}
$lbConf['servers'] = [ $server ];
}
- if ( !isset( $lbConf['externalServers'] ) ) {
- $lbConf['externalServers'] = $mainConfig->get(
'ExternalServers' );
+ if ( !isset( $lbConf['externalClusters'] ) ) {
+ $lbConf['externalClusters'] = $mainConfig->get(
'ExternalServers' );
}
} elseif ( $lbConf['class'] === 'LBFactoryMulti' ) {
if ( isset( $lbConf['serverTemplate'] ) ) {
diff --git a/includes/libs/rdbms/lbfactory/LBFactorySimple.php
b/includes/libs/rdbms/lbfactory/LBFactorySimple.php
index 0476cf2..0949092 100644
--- a/includes/libs/rdbms/lbfactory/LBFactorySimple.php
+++ b/includes/libs/rdbms/lbfactory/LBFactorySimple.php
@@ -87,7 +87,7 @@
*/
protected function newExternalLB( $cluster, $domain = false ) {
if ( !isset( $this->externalClusters[$cluster] ) ) {
- throw new InvalidArgumentException( __METHOD__ . ":
Unknown cluster \"$cluster\"" );
+ throw new InvalidArgumentException( __METHOD__ . ":
Unknown cluster \"$cluster\"." );
}
return $this->newLoadBalancer(
$this->externalClusters[$cluster] );
--
To view, visit https://gerrit.wikimedia.org/r/311612
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4bbc875e2fcd021e342959a37475ec356cb58cce
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: Catrope <roan.katt...@gmail.com>
Gerrit-Reviewer: Parent5446 <tylerro...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
