diff options
| author | George Claghorn <george.claghorn@gmail.com> | 2017-08-31 13:40:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-31 13:40:32 -0400 |
| commit | b3845dcf3c305107cd51e27ad2581637d3ca9a3c (patch) | |
| tree | 112ba8483163013e2d4fa5b84d2d97dcc7c06160 | |
| parent | c2b2a8c74fcd2e32996641503ed029c8f7484b00 (diff) | |
| parent | 390840eb4e219a26278b88df71ab18b6f8f0fe7a (diff) | |
| download | rails-b3845dcf3c305107cd51e27ad2581637d3ca9a3c.tar.gz rails-b3845dcf3c305107cd51e27ad2581637d3ca9a3c.tar.bz2 rails-b3845dcf3c305107cd51e27ad2581637d3ca9a3c.zip | |
Merge pull request #30486 from rosa/ignore-deleted-gcs-files-on-deletion
Ignore files already deleted on GCS file deletions
| -rw-r--r-- | activestorage/lib/active_storage/service/gcs_service.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/activestorage/lib/active_storage/service/gcs_service.rb b/activestorage/lib/active_storage/service/gcs_service.rb index ebf24a36d7..b3fe592097 100644 --- a/activestorage/lib/active_storage/service/gcs_service.rb +++ b/activestorage/lib/active_storage/service/gcs_service.rb @@ -35,7 +35,11 @@ module ActiveStorage def delete(key) instrument :delete, key do - file_for(key).try(:delete) + begin + file_for(key).try(:delete) + rescue Google::Cloud::NotFoundError + # Ignore files already deleted + end end end |