dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Revision: Inject Logger instead of LoggerSpi"
[lhc/web/wiklou.git]
/
includes
/
debug
/
logger
/
LegacyLogger.php
diff --git
a/includes/debug/logger/LegacyLogger.php
b/includes/debug/logger/LegacyLogger.php
index
bbcd33a
..
72c7643
100644
(file)
--- a/
includes/debug/logger/LegacyLogger.php
+++ b/
includes/debug/logger/LegacyLogger.php
@@
-21,12
+21,14
@@
namespace MediaWiki\Logger;
use DateTimeZone;
namespace MediaWiki\Logger;
use DateTimeZone;
+use Error;
use Exception;
use WikiMap;
use MWDebug;
use MWExceptionHandler;
use Psr\Log\AbstractLogger;
use Psr\Log\LogLevel;
use Exception;
use WikiMap;
use MWDebug;
use MWExceptionHandler;
use Psr\Log\AbstractLogger;
use Psr\Log\LogLevel;
+use Throwable;
use UDPTransport;
/**
use UDPTransport;
/**
@@
-269,7
+271,7
@@
class LegacyLogger extends AbstractLogger {
$e = $context['exception'];
$backtrace = false;
$e = $context['exception'];
$backtrace = false;
- if ( $e instanceof Exception ) {
+ if ( $e instanceof
Throwable || $e instanceof
Exception ) {
$backtrace = MWExceptionHandler::getRedactedTrace( $e );
} elseif ( is_array( $e ) && isset( $e['trace'] ) ) {
$backtrace = MWExceptionHandler::getRedactedTrace( $e );
} elseif ( is_array( $e ) && isset( $e['trace'] ) ) {
@@
-405,8
+407,9
@@
class LegacyLogger extends AbstractLogger {
return $item->format( 'c' );
}
return $item->format( 'c' );
}
- if ( $item instanceof Exception ) {
- return '[Exception ' . get_class( $item ) . '( ' .
+ if ( $item instanceof Throwable || $item instanceof Exception ) {
+ $which = $item instanceof Error ? 'Error' : 'Exception';
+ return '[' . $which . ' ' . get_class( $item ) . '( ' .
$item->getFile() . ':' . $item->getLine() . ') ' .
$item->getMessage() . ']';
}
$item->getFile() . ':' . $item->getLine() . ') ' .
$item->getMessage() . ']';
}