http://www.mediawiki.org/wiki/Special:Code/MediaWiki/95147
Revision: 95147
Author: reedy
Date: 2011-08-21 15:24:44 +0000 (Sun, 21 Aug 2011)
Log Message:
-----------
Add in \n from/to r95055 to LoadBalancer.php
Differentiate error messages from r95050 per Hashar
Modified Paths:
--------------
trunk/phase3/includes/db/LoadBalancer.php
trunk/phase3/includes/media/Generic.php
trunk/phase3/maintenance/deleteBatch.php
Modified: trunk/phase3/includes/db/LoadBalancer.php
===================================================================
--- trunk/phase3/includes/db/LoadBalancer.php 2011-08-21 15:16:31 UTC (rev
95146)
+++ trunk/phase3/includes/db/LoadBalancer.php 2011-08-21 15:24:44 UTC (rev
95147)
@@ -241,7 +241,7 @@
$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;
Modified: trunk/phase3/includes/media/Generic.php
===================================================================
--- trunk/phase3/includes/media/Generic.php 2011-08-21 15:16:31 UTC (rev
95146)
+++ trunk/phase3/includes/media/Generic.php 2011-08-21 15:24:44 UTC (rev
95147)
@@ -495,9 +495,16 @@
$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;
}
}
Modified: trunk/phase3/maintenance/deleteBatch.php
===================================================================
--- trunk/phase3/maintenance/deleteBatch.php 2011-08-21 15:16:31 UTC (rev
95146)
+++ trunk/phase3/maintenance/deleteBatch.php 2011-08-21 15:24:44 UTC (rev
95147)
@@ -81,7 +81,6 @@
continue;
}
-
$this->output( $page->getPrefixedText() );
$dbw->begin();
if ( $page->getNamespace() == NS_FILE ) {
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
