github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 07:53:49 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FEATURE: Support subfolders in S3 bucket name.

Browse Source 
This commit also fixes a bug where s3 uploads are not
moved to a tombstone folder when removed.
This commit is contained in:
Guo Xiang Tan
2016-08-12 17:18:19 +08:00
parent 9144fe5dc7
commit aa5de3c40a
4 changed files with 170 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/s3_helper.rb
View File

@ -16,18 +16,18 @@ class S3Helper
obj.upload_file(file, options)
end
def remove(path, copy_to_tombstone=false)
def remove(s3_filename, tombstone_filename=false)
bucket = s3_bucket
# copy the file in tombstone
if copy_to_tombstone && @tombstone_prefix.present?
if tombstone_filename && @tombstone_prefix.present?
bucket
.object(File.join(@tombstone_prefix, path))
.copy_from(copy_source: File.join(@s3_bucket, path))
.object(File.join(@tombstone_prefix, tombstone_filename))
.copy_from(copy_source: File.join(@s3_bucket, s3_filename))
end
# delete the file
bucket.object(path).delete
bucket.object(s3_filename).delete
rescue Aws::S3::Errors::NoSuchKey
end