Merge "Fix "externalCluster" LBFactorySimple setting in LBFactoryMW"

diff --git a/includes/db/loadbalancer/LBFactoryMW.php b/includes/db/loadbalancer/LBFactoryMW.php
index e90cd67..9821da1 100644 (file)
--- a/includes/db/loadbalancer/LBFactoryMW.php
+++ b/includes/db/loadbalancer/LBFactoryMW.php
@@ -98,8 +98,8 @@ abstract class LBFactoryMW {
                                }
                                $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 (file)
--- a/includes/libs/rdbms/lbfactory/LBFactorySimple.php
+++ b/includes/libs/rdbms/lbfactory/LBFactorySimple.php
@@ -87,7 +87,7 @@ class LBFactorySimple extends LBFactory {
         */
        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] );