diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
| commit | 1de335ad3f395ca6861085393ba366a9e3fb4a0d (patch) | |
| tree | f1fdd326034e05177596851be6a7127615d81498 /includes/filebackend/FileBackendMultiWrite.php | |
| parent | 9c75fa8ff6d4d38ef552c00fef5969fb154765e8 (diff) | |
| parent | f6d65e533c62f6deb21342d4901ece24497b433e (diff) | |
Merge commit 'f6d65'
# Conflicts:
# skins/ArchLinux/ArchLinux.php
Diffstat (limited to 'includes/filebackend/FileBackendMultiWrite.php')
| -rw-r--r-- | includes/filebackend/FileBackendMultiWrite.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/includes/filebackend/FileBackendMultiWrite.php b/includes/filebackend/FileBackendMultiWrite.php index bfffcc0f..f2d13eeb 100644 --- a/includes/filebackend/FileBackendMultiWrite.php +++ b/includes/filebackend/FileBackendMultiWrite.php @@ -299,7 +299,7 @@ class FileBackendMultiWrite extends FileBackend { /** * Check that a set of files are consistent across all internal backends - * and re-synchronize those files againt the "multi master" if needed. + * and re-synchronize those files against the "multi master" if needed. * * @param array $paths List of storage paths * @return Status @@ -314,6 +314,8 @@ class FileBackendMultiWrite extends FileBackend { $mStat = $mBackend->getFileStat( array( 'src' => $mPath, 'latest' => true ) ); if ( $mStat === null || ( $mSha1 !== false && !$mStat ) ) { // sanity $status->fatal( 'backend-fail-internal', $this->name ); + wfDebugLog( 'FileOperation', __METHOD__ + . ': File is not available on the master backend' ); continue; // file is not available on the master backend... } // Check of all clone backends agree with the master... @@ -326,6 +328,8 @@ class FileBackendMultiWrite extends FileBackend { $cStat = $cBackend->getFileStat( array( 'src' => $cPath, 'latest' => true ) ); if ( $cStat === null || ( $cSha1 !== false && !$cStat ) ) { // sanity $status->fatal( 'backend-fail-internal', $cBackend->getName() ); + wfDebugLog( 'FileOperation', __METHOD__ + . ': File is not available on the clone backend' ); continue; // file is not available on the clone backend... } if ( $mSha1 === $cSha1 ) { |