Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/240387
Change subject: resourceloader: Include exception log id in error message
......................................................................
resourceloader: Include exception log id in error message
This matches what we do for MWException::getHTML via OutputPage.
These IDs are okay to be public and also exposed there even if
$wgShowExceptionDetails is disabled.
Follows-up d478ffde100. Ref T110659.
Change-Id: I501eaa629161184ba89d44e53cdac20b39cb0903
---
M includes/exception/MWExceptionHandler.php
M includes/resourceloader/ResourceLoader.php
2 files changed, 10 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/87/240387/1
diff --git a/includes/exception/MWExceptionHandler.php
b/includes/exception/MWExceptionHandler.php
index d25f1a8..4e50070 100644
--- a/includes/exception/MWExceptionHandler.php
+++ b/includes/exception/MWExceptionHandler.php
@@ -485,6 +485,14 @@
return "[$id] $url $type from line $line of $file: $message";
}
+ public static function getPublicLogMessage( Exception $e ) {
+ $logId = self::getLogId( $e );
+ $type = get_class( $e );
+ return '[' . $logId . '] '
+ . gmdate( 'Y-m-d H:i:s' ) . ': '
+ . 'Fatal exception of type ' . $type;
+ }
+
/**
* Get a PSR-3 log event context from an Exception.
*
diff --git a/includes/resourceloader/ResourceLoader.php
b/includes/resourceloader/ResourceLoader.php
index 1f48514..ab36701 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -941,10 +941,10 @@
global $wgShowExceptionDetails;
if ( !$wgShowExceptionDetails ) {
- return 'Internal error';
+ return MWExceptionHandler::getPublicLogMessage( $e );
}
- return $e->__toString();
+ return MWExceptionHandler::getLogMessage( $e );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/240387
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I501eaa629161184ba89d44e53cdac20b39cb0903
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle <krinklem...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
