EBernhardson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/232869
Change subject: LoggerFactory::getLogger -> LoggerFactory::getInstance
......................................................................
LoggerFactory::getLogger -> LoggerFactory::getInstance
Change-Id: I2323368b4c39f5c76203c83cce29467c73a937b9
---
M includes/BuildDocument/PageTextBuilder.php
M includes/ElasticsearchIntermediary.php
M includes/Job/MassIndex.php
M includes/Maintenance/Reindexer.php
M includes/Search/Result.php
M includes/Searcher.php
M includes/Updater.php
M includes/Util.php
M maintenance/forceSearchIndex.php
9 files changed, 12 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/69/232869/1
diff --git a/includes/BuildDocument/PageTextBuilder.php
b/includes/BuildDocument/PageTextBuilder.php
index 619bf8f..d35539d 100644
--- a/includes/BuildDocument/PageTextBuilder.php
+++ b/includes/BuildDocument/PageTextBuilder.php
@@ -113,7 +113,7 @@
case 'none':
break;
default:
- LoggerFactory::getLogger( 'CirrusSearch' )->warning(
+ LoggerFactory::getInstance( 'CirrusSearch' )->warning(
"Invalid value for
\$wgCirrusSearchBoostOpening: {wgCirrusSearchBoostOpening}",
array( 'wgCirrusSearchBoostOpening' =>
$wgCirrusSearchBoostOpening )
);
diff --git a/includes/ElasticsearchIntermediary.php
b/includes/ElasticsearchIntermediary.php
index 1f8022b..2066df4 100644
--- a/includes/ElasticsearchIntermediary.php
+++ b/includes/ElasticsearchIntermediary.php
@@ -257,7 +257,7 @@
global $wgCirrusSearchLogElasticRequests;
if ( !$this->requestStart ) {
- LoggerFactory::getLogger( 'CirrusSearch' )->warning(
+ LoggerFactory::getInstance( 'CirrusSearch' )->warning(
'finishRequest called without staring a request'
);
return;
diff --git a/includes/Job/MassIndex.php b/includes/Job/MassIndex.php
index 874ebec..c872d3f 100644
--- a/includes/Job/MassIndex.php
+++ b/includes/Job/MassIndex.php
@@ -48,7 +48,7 @@
$title = Title::newFromDBKey( $pageDBKey );
// Skip any titles with broken keys. We can't do
anything with them.
if ( !$title ) {
- LoggerFactory::getLogger( 'CirrusSearch'
)->warning(
+ LoggerFactory::getInstance( 'CirrusSearch'
)->warning(
"Skipping invalid DBKey: {pageDBKey}",
array( 'pageDBKey' => $pageDBKey )
);
diff --git a/includes/Maintenance/Reindexer.php
b/includes/Maintenance/Reindexer.php
index 277ba2d..ff5e9dc 100644
--- a/includes/Maintenance/Reindexer.php
+++ b/includes/Maintenance/Reindexer.php
@@ -315,7 +315,7 @@
// Note that we can't fail the master here, we have to
check how many documents are in the new index in the master.
$type = get_class( $e );
$message = ElasticsearchIntermediary::extractMessage(
$e );
- LoggerFactory::getLogger( 'CirrusSearch' )->warning(
+ LoggerFactory::getInstance( 'CirrusSearch' )->warning(
"Search backend error during reindex. Error
type is '{type}' and message is: {message}",
array( 'type' => $type, 'message' => $message )
);
diff --git a/includes/Search/Result.php b/includes/Search/Result.php
index f1e49dc..df85ecd 100644
--- a/includes/Search/Result.php
+++ b/includes/Search/Result.php
@@ -184,7 +184,7 @@
}
}
if ( $best === null ) {
- LoggerFactory::getLogger( 'CirrusSearch' )->warning(
+ LoggerFactory::getInstance( 'CirrusSearch' )->warning(
"Search backend highlighted a redirect
({title}) but didn't return it.",
array( 'title' => $title )
);
diff --git a/includes/Searcher.php b/includes/Searcher.php
index 834b418..e745252 100644
--- a/includes/Searcher.php
+++ b/includes/Searcher.php
@@ -677,7 +677,7 @@
$nearMatchQuery[] = $queryPart[ 'raw' ];
continue;
}
- LoggerFactory::getLogger( 'CirrusSearch' )->warning(
+ LoggerFactory::getInstance( 'CirrusSearch' )->warning(
'Unknown query part: {queryPart}',
array( 'queryPart' => serialize( $queryPart ) )
);
@@ -1280,7 +1280,7 @@
) ) );
break;
default:
- LoggerFactory::getLogger( 'CirrusSearch' )->warning(
+ LoggerFactory::getInstance( 'CirrusSearch' )->warning(
"Invalid sort type: {sort}",
array( 'sort' => $this->sort )
);
@@ -1347,7 +1347,7 @@
},
function( $error, $key, $userName ) use ( $type,
$description, $user, $logContext ) {
$forUserName = $userName ? "for {userName} " :
'';
- LoggerFactory::getLogger( 'CirrusSearch'
)->warning(
+ LoggerFactory::getInstance( 'CirrusSearch'
)->warning(
"Pool error {$forUserName}on key {key}
during $description: {error}",
$logContext + array(
'userName' => $userName,
@@ -1382,7 +1382,7 @@
$result->setResult( true,
$this->resultsType->transformElasticsearchResult( $this->suggestPrefixes,
$this->suggestSuffixes, $result->getValue(),
$this->searchContainedSyntax ) );
if ( $responseData[ 'timed_out' ] ) {
- LoggerFactory::getLogger( 'CirrusSearch'
)->warning(
+ LoggerFactory::getInstance( 'CirrusSearch'
)->warning(
"$description timed out and only
returned partial results!",
$logContext
);
diff --git a/includes/Updater.php b/includes/Updater.php
index a0bcaf0..dea71ef 100644
--- a/includes/Updater.php
+++ b/includes/Updater.php
@@ -260,7 +260,7 @@
foreach ( $pages as $page ) {
$title = $page->getTitle();
if ( !$page->exists() ) {
- LoggerFactory::getLogger( 'CirrusSearch'
)->warning(
+ LoggerFactory::getInstance( 'CirrusSearch'
)->warning(
'Attempted to build a document for a
page that doesn\'t exist. This should be caught ' .
"earlier but wasn't. Page: {title}",
array( 'title' => $title )
diff --git a/includes/Util.php b/includes/Util.php
index 6e98a63..6fedfee 100644
--- a/includes/Util.php
+++ b/includes/Util.php
@@ -117,7 +117,7 @@
if ( $errorCallback === null ) {
$errorCallback = function( $error, $key, $userName ) {
$forUserName = $userName ? "for {userName} " :
'';
- LoggerFactory::getLogger( 'CirrusSearch'
)->warning(
+ LoggerFactory::getInstance( 'CirrusSearch'
)->warning(
"Pool error {$forUserName}on {key}:
{error}",
array( 'userName' => $userName, 'key'
=> $key, 'error' => $error )
);
diff --git a/maintenance/forceSearchIndex.php b/maintenance/forceSearchIndex.php
index 80bc193..7640cd3 100644
--- a/maintenance/forceSearchIndex.php
+++ b/maintenance/forceSearchIndex.php
@@ -359,7 +359,7 @@
try {
$content = $page->getContent();
} catch ( MWException $ex ) {
- LoggerFactory::getLogger( 'CirrusSearch'
)->warning(
+ LoggerFactory::getInstance( 'CirrusSearch'
)->warning(
"Error deserializing content, skipping
page: {pageId}",
array( 'pageId' => $row->page_id )
);
--
To view, visit https://gerrit.wikimedia.org/r/232869
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2323368b4c39f5c76203c83cce29467c73a937b9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: EBernhardson <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
