return "[$id] $url $type from line $line of $file: $message";
}
+ /**
+ * Get a normalised message for formatting with PSR-3 log event context.
+ *
+ * Must be used together with `getLogContext()` to be useful.
+ *
+ * @since 1.30
+ * @param Exception|Throwable $e
+ * @return string
+ */
+ public static function getLogNormalMessage( $e ) {
+ $type = get_class( $e );
+ $file = $e->getFile();
+ $line = $e->getLine();
+ $message = $e->getMessage();
+
+ return "[{exception_id}] {exception_url} $type from line $line of $file: $message";
+ }
+
/**
* @param Exception|Throwable $e
* @return string
return [
'exception' => $e,
'exception_id' => WebRequest::getRequestId(),
+ 'exception_url' => self::getURL() ?: '[no req]',
'caught_by' => $catcher
];
}
if ( !( $e instanceof MWException ) || $e->isLoggable() ) {
$logger = LoggerFactory::getInstance( 'exception' );
$logger->error(
- self::getLogMessage( $e ),
+ self::getLogNormalMessage( $e ),
self::getLogContext( $e, $catcher )
);
$logger = LoggerFactory::getInstance( $channel );
$logger->log(
$level,
- self::getLogMessage( $e ),
+ self::getLogNormalMessage( $e ),
self::getLogContext( $e, $catcher )
);
}