From: Aaron Schulz <aschulz@wikimedia.org>
Date: Mon, 4 Mar 2019 02:32:47 +0000 (-0800)
Subject: Avoid cached lag logging spam from changes list pages
X-Git-Tag: 1.34.0-rc.0~2666^2
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices//%22?a=commitdiff_plain;h=919671a82e470ef830d83357d9b8963b52844cc0;p=lhc%2Fweb%2Fwiklou.git

Avoid cached lag logging spam from changes list pages

We do not really care about snapshot lag for these cases, so make
them use the same method that getCacheSetOptions() uses.

Bug: T160833
Change-Id: I238aa48e0cdafb2a7f06cae93642797439f94091
---

diff --git a/includes/specials/SpecialContributions.php b/includes/specials/SpecialContributions.php
index 8a48aa6374..84121b29cd 100644
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -21,7 +21,6 @@
  * @ingroup SpecialPage
  */
 
-use MediaWiki\MediaWikiServices;
 use MediaWiki\Widget\DateInputWidget;
 
 /**
@@ -237,8 +236,7 @@ class SpecialContributions extends IncludableSpecialPage {
 				$out->addWikiMsg( 'nocontribs', $target );
 			} else {
 				# Show a message about replica DB lag, if applicable
-				$lb = MediaWikiServices::getInstance()->getDBLoadBalancer();
-				$lag = $lb->safeGetLag( $pager->getDatabase() );
+				$lag = $pager->getDatabase()->getSessionLagStatus()['lag'];
 				if ( $lag > 0 ) {
 					$out->showLagWarning( $lag );
 				}
diff --git a/includes/specials/SpecialDeletedContributions.php b/includes/specials/SpecialDeletedContributions.php
index 6022ff4816..d405be7416 100644
--- a/includes/specials/SpecialDeletedContributions.php
+++ b/includes/specials/SpecialDeletedContributions.php
@@ -21,8 +21,6 @@
  * @ingroup SpecialPage
  */
 
-use MediaWiki\MediaWikiServices;
-
 /**
  * Implements Special:DeletedContributions to display archived revisions
  * @ingroup SpecialPage
@@ -101,8 +99,7 @@ class DeletedContributionsPage extends SpecialPage {
 		}
 
 		# Show a message about replica DB lag, if applicable
-		$lb = MediaWikiServices::getInstance()->getDBLoadBalancer();
-		$lag = $lb->safeGetLag( $pager->getDatabase() );
+		$lag = $pager->getDatabase()->getSessionLagStatus()['lag'];
 		if ( $lag > 0 ) {
 			$out->showLagWarning( $lag );
 		}
diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php
index 971aa43c09..7772ef73f4 100644
--- a/includes/specials/SpecialWatchlist.php
+++ b/includes/specials/SpecialWatchlist.php
@@ -458,7 +458,7 @@ class SpecialWatchlist extends ChangesListSpecialPage {
 		$services = MediaWikiServices::getInstance();
 
 		# Show a message about replica DB lag, if applicable
-		$lag = $services->getDBLoadBalancer()->safeGetLag( $dbr );
+		$lag = $dbr->getSessionLagStatus()['lag'];
 		if ( $lag > 0 ) {
 			$output->showLagWarning( $lag );
 		}