X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2Feval.php;h=f0d7fbf87a712900edf2b6d75f692fc3dc462290;hb=7462d3075a23095fd627cebeb0f66e081ad2bede;hp=ee8bdd65b55b6abd15d5c95a4af09ceaf7f6853a;hpb=efafb74daf6a3be5353cc06ce4b8574daa6c9aef;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/eval.php b/maintenance/eval.php
index ee8bdd65b5..f0d7fbf87a 100644
--- a/maintenance/eval.php
+++ b/maintenance/eval.php
@@ -32,6 +32,7 @@
 
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\Logger\ConsoleSpi;
+use MediaWiki\MediaWikiServices;
 
 $optionsWithArgs = [ 'd' ];
 
@@ -41,15 +42,12 @@ if ( isset( $options['d'] ) ) {
 	$d = $options['d'];
 	if ( $d > 0 ) {
 		LoggerFactory::registerProvider( new ConsoleSpi );
+		// Some services hold Logger instances in object properties
+		MediaWikiServices::resetGlobalInstance();
 	}
 	if ( $d > 1 ) {
-		$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 );
 	}
 }
 
@@ -79,8 +77,8 @@ while ( ( $__line = Maintenance::readconsole() ) !== false ) {
 	try {
 		$__val = eval( $__line . ";" );
 	} catch ( Exception $__e ) {
-		echo "Caught exception " . get_class( $__e ) .
-			": {$__e->getMessage()}\n" . $__e->getTraceAsString() . "\n";
+		fwrite( STDERR, "Caught exception " . get_class( $__e ) .
+			": {$__e->getMessage()}\n" . $__e->getTraceAsString() . "\n" );
 		continue;
 	}
 	if ( wfIsHHVM() || is_null( $__val ) ) {