jenkins-bot has submitted this change and it was merged.
Change subject: Catch all stash errors in cleanup script
......................................................................
Catch all stash errors in cleanup script
bug: 56401
Change-Id: I3dcd8728a46fdcbecbda0bdc6e3aef49e8f41ed8
(cherry picked from commit de1d3b611dc31d44212643abd7710bfd9ab99533)
---
M maintenance/cleanupUploadStash.php
1 file changed, 3 insertions(+), 4 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/maintenance/cleanupUploadStash.php
b/maintenance/cleanupUploadStash.php
index c2ba555..ba7c3cf 100644
--- a/maintenance/cleanupUploadStash.php
+++ b/maintenance/cleanupUploadStash.php
@@ -81,10 +81,9 @@
try {
$stash->getFile( $key, true );
$stash->removeFileNoAuth( $key );
- } catch ( UploadStashBadPathException $ex ) {
- $this->output( "Failed removing stashed
upload with key: $key\n" );
- } catch ( UploadStashZeroLengthFileException
$ex ) {
- $this->output( "Failed removing stashed
upload with key: $key\n" );
+ } catch ( UploadStashException $ex ) {
+ $type = get_class( $ex );
+ $this->output( "Failed removing stashed
upload with key: $key ($type)\n" );
}
if ( $i % 100 == 0 ) {
$this->output( "$i\n" );
--
To view, visit https://gerrit.wikimedia.org/r/93506
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3dcd8728a46fdcbecbda0bdc6e3aef49e8f41ed8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf2
Gerrit-Owner: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
