From 919671a82e470ef830d83357d9b8963b52844cc0 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Sun, 3 Mar 2019 18:32:47 -0800 Subject: [PATCH] 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 --- includes/specials/SpecialContributions.php | 4 +--- includes/specials/SpecialDeletedContributions.php | 5 +---- includes/specials/SpecialWatchlist.php | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) 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 ); } -- 2.20.1