Aaron Schulz has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/311169

Change subject: Rename domain => localDomain in LBFactory for consistency
......................................................................

Rename domain => localDomain in LBFactory for consistency

Change-Id: I2fb66f98dddb4acc38958a7b8beec002970d43f7
---
M includes/db/loadbalancer/LBFactoryMW.php
M includes/libs/rdbms/lbfactory/LBFactory.php
2 files changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/69/311169/1

diff --git a/includes/db/loadbalancer/LBFactoryMW.php 
b/includes/db/loadbalancer/LBFactoryMW.php
index 33c48a5..2fb48c7 100644
--- a/includes/db/loadbalancer/LBFactoryMW.php
+++ b/includes/db/loadbalancer/LBFactoryMW.php
@@ -40,7 +40,7 @@
                global $wgCommandLineMode;
 
                $defaults = [
-                       'domain' => wfWikiID(),
+                       'localDomain' => wfWikiID(),
                        'hostname' => wfHostname(),
                        'trxProfiler' => 
Profiler::instance()->getTransactionProfiler(),
                        'replLogger' => LoggerFactory::getInstance( 
'DBReplication' ),
diff --git a/includes/libs/rdbms/lbfactory/LBFactory.php 
b/includes/libs/rdbms/lbfactory/LBFactory.php
index 107a7e2..b6f3317 100644
--- a/includes/libs/rdbms/lbfactory/LBFactory.php
+++ b/includes/libs/rdbms/lbfactory/LBFactory.php
@@ -50,7 +50,7 @@
        protected $wanCache;
 
        /** @var string Local domain */
-       protected $domain;
+       protected $localDomain;
        /** @var string Local hostname of the app server */
        protected $hostname;
        /** @var mixed */
@@ -79,7 +79,7 @@
         * @param array $conf
         */
        public function __construct( array $conf ) {
-               $this->domain = isset( $conf['domain'] ) ? $conf['domain'] : '';
+               $this->localDomain = isset( $conf['localDomain'] ) ? 
$conf['localDomain'] : '';
 
                if ( isset( $conf['readOnlyReason'] ) && is_string( 
$conf['readOnlyReason'] ) ) {
                        $this->readOnlyReason = $conf['readOnlyReason'];
@@ -608,7 +608,7 @@
         */
        final protected function baseLoadBalancerParams() {
                return [
-                       'localDomain' => $this->domain,
+                       'localDomain' => $this->localDomain,
                        'readOnlyReason' => $this->readOnlyReason,
                        'srvCache' => $this->srvCache,
                        'wanCache' => $this->wanCache,
@@ -641,7 +641,7 @@
         * @since 1.28
         */
        public function setDomainPrefix( $domain ) {
-               $this->domain = $domain;
+               $this->localDomain = $domain;
        }
 
        /**

-- 
To view, visit https://gerrit.wikimedia.org/r/311169
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2fb66f98dddb4acc38958a7b8beec002970d43f7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to