Add in \n from/to r95055 to LoadBalancer.php

Differentiate error messages from r95050 per Hashar

diff --git a/includes/db/LoadBalancer.php b/includes/db/LoadBalancer.php
index 671415b..171ca2e 100644 (file)
--- a/includes/db/LoadBalancer.php
+++ b/includes/db/LoadBalancer.php
@@ -241,7 +241,7 @@ class LoadBalancer {
                                        $i = $this->getRandomNonLagged( $currentLoads, $wiki );
                                        if ( $i === false && count( $currentLoads ) != 0 )  {
                                                # All slaves lagged. Switch to read-only mode
-                                               wfDebugLog( 'replication', 'All slaves lagged. Switch to read-only mode' );
+                                               wfDebugLog( 'replication', "All slaves lagged. Switch to read-only mode\n" );
                                                $wgReadOnly = wfMessage( 'readonly_lag' )->useDatabase( false )->plain();
                                                $i = $this->pickRandom( $currentLoads );
                                                $laggedSlaveMode = true;

diff --git a/includes/media/Generic.php b/includes/media/Generic.php
index ffc1a23..e22aad8 100644 (file)
--- a/includes/media/Generic.php
+++ b/includes/media/Generic.php
@@ -495,9 +495,16 @@ abstract class MediaHandler {
                        $thumbstat = stat( $dstPath );
                        if( $thumbstat['size'] == 0 || $retval != 0 ) {
                                $result = unlink( $dstPath );
-                               wfDebugLog( 'thumbnail',
-                                       sprintf( 'Removing bad %d-byte thumbnail "%s". unlink() result: %d',
-                                               $thumbstat['size'], $dstPath, $result ) );
+
+                               if ( $result ) {
+                                       wfDebugLog( 'thumbnail',
+                                               sprintf( 'Removing bad %d-byte thumbnail "%s". unlink() succeeded',
+                                                       $thumbstat['size'], $dstPath ) );
+                               } else {
+                                       wfDebugLog( 'thumbnail',
+                                               sprintf( 'Removing bad %d-byte thumbnail "%s". unlink() failed',
+                                                       $thumbstat['size'], $dstPath ) );
+                               }
                                return true;
                        }
                }

diff --git a/maintenance/deleteBatch.php b/maintenance/deleteBatch.php
index f5f850a..fdc4cfb 100644 (file)
--- a/maintenance/deleteBatch.php
+++ b/maintenance/deleteBatch.php
@@ -81,7 +81,6 @@ class DeleteBatch extends Maintenance {
                                continue;
                        }
 
-
                        $this->output( $page->getPrefixedText() );
                        $dbw->begin();
                        if ( $page->getNamespace() == NS_FILE ) {