From: Aaron Schulz <aschulz@wikimedia.org>
Date: Fri, 23 May 2014 00:37:33 +0000 (-0700)
Subject: Improved FileBackend failure logging a bit
X-Git-Tag: 1.31.0-rc.0~15610
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=1d59d6152e26a00e75117449e18a187b6800aba6;p=lhc%2Fweb%2Fwiklou.git

Improved FileBackend failure logging a bit

* This partly follows up on 2cfce9f

Change-Id: I9d15f44d8000f52fd7b307d358c895452ee96a8d
---

diff --git a/includes/filebackend/FileBackendStore.php b/includes/filebackend/FileBackendStore.php
index ce4deddf9a..340c3153da 100644
--- a/includes/filebackend/FileBackendStore.php
+++ b/includes/filebackend/FileBackendStore.php
@@ -357,8 +357,8 @@ abstract class FileBackendStore extends FileBackend {
 			$status->merge( $this->doConcatenate( $params ) );
 			$sec = microtime( true ) - $start_time;
 			if ( !$status->isOK() ) {
-				wfDebugLog( 'FileOperation', get_class( $this ) . " failed to concatenate " .
-					count( $params['srcs'] ) . " file(s) [$sec sec]" );
+				wfDebugLog( 'FileOperation', get_class( $this ) . "-{$this->name}" .
+					" failed to concatenate " . count( $params['srcs'] ) . " file(s) [$sec sec]" );
 			}
 		}
 
@@ -1122,6 +1122,8 @@ abstract class FileBackendStore extends FileBackend {
 				$subStatus->success[$i] = false;
 				++$subStatus->failCount;
 			}
+			wfDebugLog( 'FileOperation', get_class( $this ) . "-{$this->name} " .
+				" stat failure; aborted operations: " . FormatJson::encode( $ops ) );
 		}
 
 		// Merge errors into status fields