diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2020-12-24 15:53:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-24 15:53:45 +0100 |
| commit | e89648574f20f24c3e3e8dafeefe5bcca7348ea5 (patch) | |
| tree | 1b7f5b9af7c5f455d0ef992305f337828f0a61d0 | |
| parent | ba0b79fc5c698b3d2ca4849bc3a711c75bd76d22 (diff) | |
Fix error when changing ACL on missing objects during suspension (#15420)
| -rw-r--r-- | app/services/suspend_account_service.rb | 6 | ||||
| -rw-r--r-- | app/services/unsuspend_account_service.rb | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/app/services/suspend_account_service.rb b/app/services/suspend_account_service.rb index 22e51970860..9f4da91d4c0 100644 --- a/app/services/suspend_account_service.rb +++ b/app/services/suspend_account_service.rb @@ -70,7 +70,11 @@ class SuspendAccountService < BaseService styles.each do |style| case Paperclip::Attachment.default_options[:storage] when :s3 - attachment.s3_object(style).acl.put(acl: 'private') + begin + attachment.s3_object(style).acl.put(acl: 'private') + rescue Aws::S3::Errors::NoSuchKey + Rails.logger.warn "Tried to change acl on non-existent key #{attachment.s3_object(style).key}" + end when :fog # Not supported when :filesystem diff --git a/app/services/unsuspend_account_service.rb b/app/services/unsuspend_account_service.rb index be7ad9df3e4..ce9ee48ed11 100644 --- a/app/services/unsuspend_account_service.rb +++ b/app/services/unsuspend_account_service.rb @@ -61,7 +61,11 @@ class UnsuspendAccountService < BaseService styles.each do |style| case Paperclip::Attachment.default_options[:storage] when :s3 - attachment.s3_object(style).acl.put(acl: Paperclip::Attachment.default_options[:s3_permissions]) + begin + attachment.s3_object(style).acl.put(acl: Paperclip::Attachment.default_options[:s3_permissions]) + rescue Aws::S3::Errors::NoSuchKey + Rails.logger.warn "Tried to change acl on non-existent key #{attachment.s3_object(style).key}" + end when :fog # Not supported when :filesystem |