[MediaWiki-commits] [Gerrit] Improved addMissingMetadata() on POST failure - change (mediawiki/core)

2015-07-28 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Improved addMissingMetadata() on POST failure
..


Improved addMissingMetadata() on POST failure

* If the POST failed but the sha1 was computed, then use
  and cache that value rather than false.

Change-Id: I42b53c823013ecd9b281406e3d533a21e0de7cfb
---
M includes/filebackend/SwiftFileBackend.php
1 file changed, 2 insertions(+), 3 deletions(-)

Approvals:
  Gilles: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/filebackend/SwiftFileBackend.php 
b/includes/filebackend/SwiftFileBackend.php
index 2ccafe4..e9df205 100644
--- a/includes/filebackend/SwiftFileBackend.php
+++ b/includes/filebackend/SwiftFileBackend.php
@@ -670,10 +670,10 @@
$ps = Profiler::instance()-scopedProfileIn( __METHOD__ . 
-{$this-name} );
wfDebugLog( 'SwiftBackend', __METHOD__ . : $path was not 
stored with SHA-1 metadata. );
 
+   $objHdrs['x-object-meta-sha1base36'] = false;
+
$auth = $this-getAuthentication();
if ( !$auth ) {
-   $objHdrs['x-object-meta-sha1base36'] = false;
-
return $objHdrs; // failed
}
 
@@ -700,7 +700,6 @@
}
 
wfDebugLog( 'SwiftBackend', __METHOD__ . : unable to set SHA-1 
metadata for $path );
-   $objHdrs['x-object-meta-sha1base36'] = false;
 
return $objHdrs; // failed
}

-- 
To view, visit https://gerrit.wikimedia.org/r/226405
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I42b53c823013ecd9b281406e3d533a21e0de7cfb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Gilles gdu...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Improved addMissingMetadata() on POST failure - change (mediawiki/core)

2015-07-22 Thread Aaron Schulz (Code Review) 
Aaron Schulz has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/226405

Change subject: Improved addMissingMetadata() on POST failure
..

Improved addMissingMetadata() on POST failure

* If the POST failed but the sha1 was computed, then use
  and cache that value rather than false.

Change-Id: I42b53c823013ecd9b281406e3d533a21e0de7cfb
---
M includes/filebackend/SwiftFileBackend.php
1 file changed, 2 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/05/226405/1

diff --git a/includes/filebackend/SwiftFileBackend.php 
b/includes/filebackend/SwiftFileBackend.php
index 2ccafe4..e9df205 100644
--- a/includes/filebackend/SwiftFileBackend.php
+++ b/includes/filebackend/SwiftFileBackend.php
@@ -670,10 +670,10 @@
$ps = Profiler::instance()-scopedProfileIn( __METHOD__ . 
-{$this-name} );
wfDebugLog( 'SwiftBackend', __METHOD__ . : $path was not 
stored with SHA-1 metadata. );
 
+   $objHdrs['x-object-meta-sha1base36'] = false;
+
$auth = $this-getAuthentication();
if ( !$auth ) {
-   $objHdrs['x-object-meta-sha1base36'] = false;
-
return $objHdrs; // failed
}
 
@@ -700,7 +700,6 @@
}
 
wfDebugLog( 'SwiftBackend', __METHOD__ . : unable to set SHA-1 
metadata for $path );
-   $objHdrs['x-object-meta-sha1base36'] = false;
 
return $objHdrs; // failed
}

-- 
To view, visit https://gerrit.wikimedia.org/r/226405
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I42b53c823013ecd9b281406e3d533a21e0de7cfb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits