Remove setting of $wgReadOnly in LBFactoryMulti

[lhc/web/wiklou.git] / includes / db / loadbalancer / LBFactoryMulti.php

diff --git a/includes/db/loadbalancer/LBFactoryMulti.php b/includes/db/loadbalancer/LBFactoryMulti.php
index 92fbccd..6397bca 100644 (file)
--- a/includes/db/loadbalancer/LBFactoryMulti.php
+++ b/includes/db/loadbalancer/LBFactoryMulti.php
@@ -68,6 +68,8 @@
  *
  *     masterTemplateOverrides     An override array for all master servers.
  *
+ *     loadMonitorClass            Name of the LoadMonitor class to always use.
+ *
  *     readOnlyBySection           A map of section name to read-only message.
  *                                 Missing or false for read/write.
  *
@@ -142,6 +144,9 @@ class LBFactoryMulti extends LBFactory {
        /** @var LoadBalancer[] */
        private $extLBs = array();
 
+       /** @var string */
+       private $loadMonitorClass;
+
        /** @var string */
        private $lastWiki;
 
@@ -159,7 +164,7 @@ class LBFactoryMulti extends LBFactory {
                $optional = array( 'groupLoadsBySection', 'groupLoadsByDB', 'hostsByName',
                        'externalLoads', 'externalTemplateOverrides', 'templateOverridesByServer',
                        'templateOverridesByCluster', 'masterTemplateOverrides',
-                       'readOnlyBySection' );
+                       'readOnlyBySection', 'loadMonitorClass' );
 
                foreach ( $required as $key ) {
                        if ( !isset( $conf[$key] ) ) {
@@ -173,13 +178,6 @@ class LBFactoryMulti extends LBFactory {
                                $this->$key = $conf[$key];
                        }
                }
-
-               // Check for read-only mode
-               $section = $this->getSectionForWiki();
-               if ( !empty( $this->readOnlyBySection[$section] ) ) {
-                       global $wgReadOnly;
-                       $wgReadOnly = $this->readOnlyBySection[$section];
-               }
        }
 
        /**
@@ -289,6 +287,7 @@ class LBFactoryMulti extends LBFactory {
                $servers = $this->makeServerArray( $template, $loads, $groupLoads );
                $lb = new LoadBalancer( array(
                        'servers' => $servers,
+                       'loadMonitor' => $this->loadMonitorClass
                ) );
 
                return $lb;
@@ -319,6 +318,8 @@ class LBFactoryMulti extends LBFactory {
                                        $serverInfo = $this->masterTemplateOverrides + $serverInfo;
                                }
                                $master = false;
+                       } else {
+                               $serverInfo['slave'] = true;
                        }
                        if ( isset( $this->templateOverridesByServer[$serverName] ) ) {
                                $serverInfo = $this->templateOverridesByServer[$serverName] + $serverInfo;