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
rdbms: Restore debug toolbar "Queries" feature
[lhc/web/wiklou.git]
/
includes
/
debug
/
logger
/
LegacyLogger.php
diff --git
a/includes/debug/logger/LegacyLogger.php
b/includes/debug/logger/LegacyLogger.php
index
9f63ede
..
974b044
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;
/**
@@
-100,16
+102,15
@@
class LegacyLogger extends AbstractLogger {
$level = self::$levelMapping[$level];
}
if ( $this->channel === 'DBQuery'
$level = self::$levelMapping[$level];
}
if ( $this->channel === 'DBQuery'
- && isset( $context['method'] )
- && isset( $context['master'] )
- && isset( $context['runtime'] )
+ && $level === self::$levelMapping[LogLevel::DEBUG]
+ && isset( $context['sql'] )
) {
// Also give the query information to the MWDebug tools
$enabled = MWDebug::query(
) {
// Also give the query information to the MWDebug tools
$enabled = MWDebug::query(
- $
message
,
+ $
context['sql']
,
$context['method'],
$context['method'],
- $context['
master
'],
- $context['
runtime
']
+ $context['
runtime
'],
+ $context['
db_host
']
);
if ( $enabled ) {
// If we the toolbar was enabled, return early so that we don't
);
if ( $enabled ) {
// If we the toolbar was enabled, return early so that we don't
@@
-269,7
+270,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'] ) ) {
@@
-327,7
+328,7
@@
class LegacyLogger extends AbstractLogger {
$date = $d->format( 'D M j G:i:s T Y' );
$host = wfHostname();
$date = $d->format( 'D M j G:i:s T Y' );
$host = wfHostname();
- $wiki = WikiMap::getWikiIdFromD
omain( WikiMap::getCurrentWiki
Domain() );
+ $wiki = WikiMap::getWikiIdFromD
bDomain( WikiMap::getCurrentWikiDb
Domain() );
$text = "{$date}\t{$host}\t{$wiki}\t{$message}\n";
return $text;
$text = "{$date}\t{$host}\t{$wiki}\t{$message}\n";
return $text;
@@
-343,7
+344,7
@@
class LegacyLogger extends AbstractLogger {
*/
protected static function formatAsWfDebugLog( $channel, $message, $context ) {
$time = wfTimestamp( TS_DB );
*/
protected static function formatAsWfDebugLog( $channel, $message, $context ) {
$time = wfTimestamp( TS_DB );
- $wiki = WikiMap::getWikiIdFromD
omain( WikiMap::getCurrentWiki
Domain() );
+ $wiki = WikiMap::getWikiIdFromD
bDomain( WikiMap::getCurrentWikiDb
Domain() );
$host = wfHostname();
$text = "{$time} {$host} {$wiki}: {$message}\n";
return $text;
$host = wfHostname();
$text = "{$time} {$host} {$wiki}: {$message}\n";
return $text;
@@
-405,8
+406,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() . ']';
}