X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FSiteStats.php;h=cf3a1ebdf7adfbb60e59837af84174996bd0d037;hb=2dfeefe44ec9f2ee975ff4cf5a6c349729c8c80f;hp=745c89166bd0ac498732b9ac37efa971897a50a8;hpb=767b7481634a8581feab779e4fca36d6b57a7855;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/SiteStats.php b/includes/SiteStats.php
index 745c89166b..cf3a1ebdf7 100644
--- a/includes/SiteStats.php
+++ b/includes/SiteStats.php
@@ -52,14 +52,14 @@ class SiteStats {
 		$config = MediaWikiServices::getInstance()->getMainConfig();
 
 		$lb = self::getLB();
-		$dbr = $lb->getConnection( DB_REPLICA );
+		$dbr = $lb->getConnectionRef( DB_REPLICA );
 		wfDebug( __METHOD__ . ": reading site_stats from replica DB\n" );
 		$row = self::doLoadFromDB( $dbr );
 
 		if ( !self::isRowSane( $row ) && $lb->hasOrMadeRecentMasterChanges() ) {
 			// Might have just been initialized during this request? Underflow?
 			wfDebug( __METHOD__ . ": site_stats damaged or missing on replica DB\n" );
-			$row = self::doLoadFromDB( $lb->getConnection( DB_MASTER ) );
+			$row = self::doLoadFromDB( $lb->getConnectionRef( DB_MASTER ) );
 		}
 
 		if ( !self::isRowSane( $row ) ) {
@@ -76,7 +76,7 @@ class SiteStats {
 				SiteStatsInit::doAllAndCommit( $dbr );
 			}
 
-			$row = self::doLoadFromDB( $lb->getConnection( DB_MASTER ) );
+			$row = self::doLoadFromDB( $lb->getConnectionRef( DB_MASTER ) );
 		}
 
 		if ( !self::isRowSane( $row ) ) {
@@ -149,12 +149,13 @@ class SiteStats {
 	 */
 	public static function numberingroup( $group ) {
 		$cache = MediaWikiServices::getInstance()->getMainWANObjectCache();
+		$fname = __METHOD__;
 
 		return $cache->getWithSetCallback(
 			$cache->makeKey( 'SiteStats', 'groupcounts', $group ),
 			$cache::TTL_HOUR,
-			function ( $oldValue, &$ttl, array &$setOpts ) use ( $group ) {
-				$dbr = self::getLB()->getConnection( DB_REPLICA );
+			function ( $oldValue, &$ttl, array &$setOpts ) use ( $group, $fname ) {
+				$dbr = self::getLB()->getConnectionRef( DB_REPLICA );
 				$setOpts += Database::getCacheSetOptions( $dbr );
 
 				return (int)$dbr->selectField(
@@ -164,7 +165,7 @@ class SiteStats {
 						'ug_group' => $group,
 						'ug_expiry IS NULL OR ug_expiry >= ' . $dbr->addQuotes( $dbr->timestamp() )
 					],
-					__METHOD__
+					$fname
 				);
 			},
 			[ 'pcTTL' => $cache::TTL_PROC_LONG ]
@@ -199,19 +200,20 @@ class SiteStats {
 	 */
 	public static function pagesInNs( $ns ) {
 		$cache = MediaWikiServices::getInstance()->getMainWANObjectCache();
+		$fname = __METHOD__;
 
 		return $cache->getWithSetCallback(
 			$cache->makeKey( 'SiteStats', 'page-in-namespace', $ns ),
 			$cache::TTL_HOUR,
-			function ( $oldValue, &$ttl, array &$setOpts ) use ( $ns ) {
-				$dbr = self::getLB()->getConnection( DB_REPLICA );
+			function ( $oldValue, &$ttl, array &$setOpts ) use ( $ns, $fname ) {
+				$dbr = self::getLB()->getConnectionRef( DB_REPLICA );
 				$setOpts += Database::getCacheSetOptions( $dbr );
 
 				return (int)$dbr->selectField(
 					'page',
 					'COUNT(*)',
 					[ 'page_namespace' => $ns ],
-					__METHOD__
+					$fname
 				);
 			},
 			[ 'pcTTL' => $cache::TTL_PROC_LONG ]