X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2Fshell.php;h=65c353a29e18b74a5d607e4d982b8b2498a26bce;hb=71f6a71132a2d317a9869d408f9b65ed99cd04f1;hp=5df5b54f874ddf94e4ae9e6810b2230dfeb13c2f;hpb=6f466c166e3ba5ea8f2e1a37bc32d3c02901c3e0;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/shell.php b/maintenance/shell.php
index 5df5b54f87..65c353a29e 100644
--- a/maintenance/shell.php
+++ b/maintenance/shell.php
@@ -36,6 +36,7 @@
 
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\Logger\ConsoleSpi;
+use MediaWiki\MediaWikiServices;
 
 require_once __DIR__ . '/Maintenance.php';
 
@@ -83,17 +84,13 @@ class MediaWikiShell extends Maintenance {
 		$d = intval( $this->getOption( 'd' ) );
 		if ( $d > 0 ) {
 			LoggerFactory::registerProvider( new ConsoleSpi );
+			// Some services hold Logger instances in object properties
+			MediaWikiServices::resetGlobalInstance();
 		}
 		if ( $d > 1 ) {
 			# Set DBO_DEBUG (equivalent of $wgDebugDumpSql)
-			# XXX copy pasted from eval.php :(
-			$lb = wfGetLB();
-			$serverCount = $lb->getServerCount();
-			for ( $i = 0; $i < $serverCount; $i++ ) {
-				$server = $lb->getServerInfo( $i );
-				$server['flags'] |= DBO_DEBUG;
-				$lb->setServerInfo( $i, $server );
-			}
+			wfGetDB( DB_MASTER )->setFlag( DBO_DEBUG );
+			wfGetDB( DB_REPLICA )->setFlag( DBO_DEBUG );
 		}
 	}