From: Aaron <aschulz@wikimedia.org>
Date: Mon, 10 Sep 2012 21:01:29 +0000 (-0700)
Subject: [FileBackend] Added concatenate() failure logging.
X-Git-Tag: 1.31.0-rc.0~22415
X-Git-Url: http://git.cyclocoop.org///%22%40url%40//%22?a=commitdiff_plain;h=497172ce76cd2e5a1879254cf256883267ff15a4;p=lhc%2Fweb%2Fwiklou.git

[FileBackend] Added concatenate() failure logging.

Change-Id: Iebc0f6e4caf57e44903dd3f0db6e3f95d589f13e
---

diff --git a/includes/filebackend/FileBackendStore.php b/includes/filebackend/FileBackendStore.php
index 57715605b2..083dfea9cd 100644
--- a/includes/filebackend/FileBackendStore.php
+++ b/includes/filebackend/FileBackendStore.php
@@ -292,8 +292,14 @@ abstract class FileBackendStore extends FileBackend {
 		// Try to lock the source files for the scope of this function
 		$scopeLockS = $this->getScopedFileLocks( $params['srcs'], LockManager::LOCK_UW, $status );
 		if ( $status->isOK() ) {
-			// Actually do the concatenation
+			// Actually do the file concatenation...
+			$start_time = microtime( true );
 			$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]" );
+			}
 		}
 
 		wfProfileOut( __METHOD__ . '-' . $this->name );