From 5a2afad3b0c5dd4c78015610eb1ab95186a6f3f4 Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Fri, 19 Aug 2011 23:19:26 +0000 Subject: [PATCH] Upstream wikia changes --- includes/db/LoadBalancer.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/includes/db/LoadBalancer.php b/includes/db/LoadBalancer.php index ab3174fc15..671415bfbc 100644 --- a/includes/db/LoadBalancer.php +++ b/includes/db/LoadBalancer.php @@ -140,10 +140,10 @@ class LoadBalancer { foreach ( $lags as $i => $lag ) { if ( $i != 0 ) { if ( $lag === false ) { - wfDebug( "Server #$i is not replicating\n" ); + wfDebugLog( 'replication', "Server #$i is not replicating\n" ); unset( $loads[$i] ); } elseif ( isset( $this->mServers[$i]['max lag'] ) && $lag > $this->mServers[$i]['max lag'] ) { - wfDebug( "Server #$i is excessively lagged ($lag seconds)\n" ); + wfDebugLog( 'replication', "Server #$i is excessively lagged ($lag seconds)\n" ); unset( $loads[$i] ); } } @@ -241,6 +241,7 @@ class LoadBalancer { $i = $this->getRandomNonLagged( $currentLoads, $wiki ); if ( $i === false && count( $currentLoads ) != 0 ) { # All slaves lagged. Switch to read-only mode + wfDebugLog( 'replication', 'All slaves lagged. Switch to read-only mode' ); $wgReadOnly = wfMessage( 'readonly_lag' )->useDatabase( false )->plain(); $i = $this->pickRandom( $currentLoads ); $laggedSlaveMode = true; -- 2.20.1