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 "Revert "Use display name in category page subheadings if provided""
[lhc/web/wiklou.git]
/
includes
/
exception
/
MWExceptionHandler.php
diff --git
a/includes/exception/MWExceptionHandler.php
b/includes/exception/MWExceptionHandler.php
index
4a1f190
..
3d8ddb8
100644
(file)
--- a/
includes/exception/MWExceptionHandler.php
+++ b/
includes/exception/MWExceptionHandler.php
@@
-87,7
+87,12
@@
class MWExceptionHandler {
* @param Exception|Throwable $e
*/
public static function rollbackMasterChangesAndLog( $e ) {
* @param Exception|Throwable $e
*/
public static function rollbackMasterChangesAndLog( $e ) {
- $lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
+ $services = MediaWikiServices::getInstance();
+ if ( $services->isServiceDisabled( 'DBLoadBalancerFactory' ) ) {
+ return; // T147599
+ }
+
+ $lbFactory = $services->getDBLoadBalancerFactory();
if ( $lbFactory->hasMasterChanges() ) {
$logger = LoggerFactory::getInstance( 'Bug56269' );
$logger->warning(
if ( $lbFactory->hasMasterChanges() ) {
$logger = LoggerFactory::getInstance( 'Bug56269' );
$logger->warning(
@@
-279,7
+284,7
@@
TXT;
$trace = $trace ?: debug_backtrace();
$logger = LoggerFactory::getInstance( 'fatal' );
$logger->error( $msg, [
$trace = $trace ?: debug_backtrace();
$logger = LoggerFactory::getInstance( 'fatal' );
$logger->error( $msg, [
- 'exception' => [
+ '
fatal_
exception' => [
'class' => 'ErrorException',
'message' => "PHP Fatal Error: {$message}",
'code' => $level,
'class' => 'ErrorException',
'message' => "PHP Fatal Error: {$message}",
'code' => $level,