Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

exception: Hide suppressed errors in 'error' log, flag in 'error-json'

Browse source 
Follows-up 399ba2f.

Bug: T75619
Bug: T45086
Change-Id: I1f312660c058a3940bf1e9425f86cfd531121ba3
This commit is contained in:
Timo Tijhof 2014-12-02 22:41:00 +00:00 committed by BryanDavis
parent 8cddc9269b
commit b5efa72afd
1 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
includes/exception/MWExceptionHandler.php
View file

@ -436,6 +436,11 @@ TXT;
'message' => $e->getMessage(),
);
if ( $e instanceof ErrorException && ( error_reporting() & $e->getSeverity() ) === 0 ) {
// Flag surpressed errors
$exceptionData['suppressed'] = true;
}
// Because MediaWiki is first and foremost a web application, we set a
// 'url' key unconditionally, but set it to null if the exception does
// not occur in the context of a web request, as a way of making that
@ -481,18 +486,23 @@ TXT;
* Log an exception that wasn't thrown but made to wrap an error.
*
* @since 1.25
* @param Exception $e
* @param ErrorException $e
*/
protected static function logError( Exception $e ) {
protected static function logError( ErrorException $e ) {
global $wgLogExceptionBacktrace;
$log = self::getLogMessage( $e );
if ( $wgLogExceptionBacktrace ) {
wfDebugLog( 'error', $log . "\n" . $e->getTraceAsString() );
} else {
wfDebugLog( 'error', $log );
// The set_error_handler callback is independent from error_reporting.
// Filter out unwanted errors manually (e.g. when wfSuppressWarnings is active).
if ( ( error_reporting() & $e->getSeverity() ) !== 0 ) {
$log = self::getLogMessage( $e );
if ( $wgLogExceptionBacktrace ) {
wfDebugLog( 'error', $log . "\n" . $e->getTraceAsString() );
} else {
wfDebugLog( 'error', $log );
}
}
// Include all errors in the json log (surpressed errors will be flagged)
$json = self::jsonSerializeException( $e, false, FormatJson::ALL_OK );
if ( $json !== false ) {
wfDebugLog( 'error-json', $json, 'private' );