wikimedia/mediawiki-extensions-TextExtracts
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/TextExtracts synced 2024-11-14 19:30:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

When APIParse fails log the warning and return null

Browse source 
API Parse request fails from time to time which causes PHP notice
error. In order to understand whats going on lets introduce error
logging as temporary solution. This will give us possibility to
find the error instead of silently returning null. For now we will
keep old behaviour and return null in that case explictly. This will
avoid future php notice errors.

Changes:
 - when API parse request fails log the error and return null

Bug: T169017
Change-Id: Ib908821b76a1e8b59235643854752c4f5910a274
This commit is contained in:
Piotr Miazga 2017-08-01 23:03:26 +02:00
parent cf47eb0b17
commit fcda3b365b
1 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
includes/ApiQueryExtracts.php
View file

@ -24,6 +24,7 @@ use ApiQueryBase;
use BagOStuff;
use Config;
use FauxRequest;
use MediaWiki\Logger\LoggerFactory;
use MediaWiki\MediaWikiServices;
use MWTidy;
use ParserCache;
@ -205,9 +206,12 @@ class ApiQueryExtracts extends ApiQueryBase {
/**
* Returns page HTML
* @param WikiPage $page
* @return string
* @return string|null
* @throws ApiUsageException
* @throws UsageException
*/
private function parse( WikiPage $page ) {
$apiException = null;
if ( !$this->parserOptions ) {
$this->parserOptions = new ParserOptions( new User( '127.0.0.1' ) );
if ( is_callable( [ $this->parserOptions, 'setWrapOutputClass' ] ) ) {
@ -245,6 +249,7 @@ class ApiQueryExtracts extends ApiQueryBase {
'Types' => [],
] );
} catch ( ApiUsageException $e ) {
$apiException = $e->__toString();
if ( $e->getStatusValue()->hasMessage( 'apierror-nosuchsection' ) ) {
// Looks like we tried to get the intro to a page without
// sections! Lets just grab what we can get.
@ -261,6 +266,7 @@ class ApiQueryExtracts extends ApiQueryBase {
throw $e;
}
} catch ( UsageException $e ) {
$apiException = $e->__toString();
if ( $e->getCodeString() === 'nosuchsection' ) {
// Looks like we tried to get the intro to a page without
// sections! Lets just grab what we can get.
@ -277,6 +283,17 @@ class ApiQueryExtracts extends ApiQueryBase {
throw $e;
}
}
if ( !array_key_exists( 'parse', $data ) ) {
LoggerFactory::getInstance( 'textextracts' )->warning(
'API Parse request failed while generating text extract', [
'title' => $page->getTitle()->getFullText(),
'url' => $this->getRequest()->getFullRequestURL(),
'exception' => $apiException,
'request' => $request
] );
return null;
}
return $data['parse']['text']['*'];
}