Avoid cached lag logging spam from changes list pages
authorAaron Schulz <aschulz@wikimedia.org>
Mon, 4 Mar 2019 02:32:47 +0000 (18:32 -0800)
committerAaron Schulz <aschulz@wikimedia.org>
Mon, 4 Mar 2019 03:18:03 +0000 (03:18 +0000)
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
includes/specials/SpecialDeletedContributions.php
includes/specials/SpecialWatchlist.php

index 8a48aa6..84121b2 100644 (file)
@@ -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 );
                                }
index 6022ff4..d405be7 100644 (file)
@@ -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 );
                }
index 971aa43..7772ef7 100644 (file)
@@ -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 );
                }