X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2Feval.php;h=f0d7fbf87a712900edf2b6d75f692fc3dc462290;hb=82182ec0e27faa7a56be82703ffe1af4bb860c19;hp=e20c477af05490dba5064d5e0edfcc8e88dfb341;hpb=69bd2e54d698f32120940f80f3493479297ecf74;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/eval.php b/maintenance/eval.php
index e20c477af0..f0d7fbf87a 100644
--- a/maintenance/eval.php
+++ b/maintenance/eval.php
@@ -30,24 +30,24 @@
  * @ingroup Maintenance
  */
 
-$optionsWithArgs = array( 'd' );
+use MediaWiki\Logger\LoggerFactory;
+use MediaWiki\Logger\ConsoleSpi;
+use MediaWiki\MediaWikiServices;
+
+$optionsWithArgs = [ 'd' ];
 
-/** */
 require_once __DIR__ . "/commandLine.inc";
 
 if ( isset( $options['d'] ) ) {
 	$d = $options['d'];
 	if ( $d > 0 ) {
-		$wgDebugLogFile = '/dev/stdout';
+		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 );
 	}
 }
 
@@ -77,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 ) ) {