Switch jquery.sortable to use mw-sortable and mw-unsortable classes, to be in line...

[lhc/web/wiklou.git] / includes / db / LoadBalancer.php

diff --git a/includes/db/LoadBalancer.php b/includes/db/LoadBalancer.php
index 4ab044e..069b8e1 100644 (file)
--- a/includes/db/LoadBalancer.php
+++ b/includes/db/LoadBalancer.php
@@ -50,8 +50,17 @@ class LoadBalancer {
                $this->mLaggedSlaveMode = false;
                $this->mErrorConnection = false;
                $this->mAllowLagged = false;
-               $this->mLoadMonitorClass = isset( $params['loadMonitor'] )
-                       ? $params['loadMonitor'] : 'LoadMonitor_MySQL';
+
+               if ( isset( $params['loadMonitor'] ) ) {
+                       $this->mLoadMonitorClass = $params['loadMonitor'];
+               } else {
+                       $master = reset( $params['servers'] );
+                       if ( isset( $master['type'] ) && $master['type'] === 'mysql' ) {
+                               $this->mLoadMonitorClass = 'LoadMonitor_MySQL';
+                       } else {
+                               $this->mLoadMonitorClass = 'LoadMonitor_Null';
+                       }
+               }
 
                foreach( $params['servers'] as $i => $server ) {
                        $this->mLoads[$i] = $server['load'];
@@ -669,7 +678,7 @@ class LoadBalancer {
 
                # Create object
                wfDebug( "Connecting to $host $dbname...\n" );
-               $db = DatabaseBase::newFromType( $server['type'], $server );
+               $db = DatabaseBase::factory( $server['type'], $server );
                if ( $db->isOpen() ) {
                        wfDebug( "Connected to $host $dbname.\n" );
                } else {