From 72d334bdf6ee4ba727d5dabed571fb59559450a3 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Tue, 26 Apr 2016 20:25:38 -0700 Subject: [PATCH] Allow for logging cases when parser cache is rejected Bug: T133659 Change-Id: I779eeffc2ae0533c1929b189a19339a0dc4986f5 --- includes/parser/ParserCache.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/includes/parser/ParserCache.php b/includes/parser/ParserCache.php index 916cfc26a1..731d4a0186 100644 --- a/includes/parser/ParserCache.php +++ b/includes/parser/ParserCache.php @@ -146,14 +146,17 @@ class ParserCache { if ( !$useOutdated && $optionsKey->expired( $article->getTouched() ) ) { wfIncrStats( "pcache.miss.expired" ); $cacheTime = $optionsKey->getCacheTime(); - wfDebug( "Parser options key expired, touched " . $article->getTouched() + wfDebugLog( "ParserCache", + "Parser options key expired, touched " . $article->getTouched() . ", epoch $wgCacheEpoch, cached $cacheTime\n" ); return false; } elseif ( $optionsKey->isDifferentRevision( $article->getLatest() ) ) { wfIncrStats( "pcache.miss.revid" ); $revId = $article->getLatest(); $cachedRevId = $optionsKey->getCacheRevisionId(); - wfDebug( "ParserOutput key is for an old revision, latest $revId, cached $cachedRevId\n" ); + wfDebugLog( "ParserCache", + "ParserOutput key is for an old revision, latest $revId, cached $cachedRevId\n" + ); return false; } @@ -222,14 +225,15 @@ class ParserCache { if ( !$useOutdated && $value->expired( $touched ) ) { wfIncrStats( "pcache.miss.expired" ); $cacheTime = $value->getCacheTime(); - wfDebug( "ParserOutput key expired, touched $touched, " + wfDebugLog( "ParserCache", + "ParserOutput key expired, touched $touched, " . "epoch $wgCacheEpoch, cached $cacheTime\n" ); $value = false; } elseif ( $value->isDifferentRevision( $article->getLatest() ) ) { wfIncrStats( "pcache.miss.revid" ); $revId = $article->getLatest(); $cachedRevId = $value->getCacheRevisionId(); - wfDebug( + wfDebugLog( "ParserCache", "ParserOutput key is for an old revision, latest $revId, cached $cachedRevId\n" ); $value = false; @@ -237,7 +241,7 @@ class ParserCache { Hooks::run( 'RejectParserCacheValue', [ $value, $wikiPage, $popts ] ) === false ) { wfIncrStats( 'pcache.miss.rejected' ); - wfDebug( + wfDebugLog( "ParserCache", "ParserOutput key valid, but rejected by RejectParserCacheValue hook handler.\n" ); $value = false; -- 2.20.1