github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-03 19:39:30 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: make uploads recovery compatible with multisite.

Browse Source
This commit is contained in:
Vinoth Kannan
2019-08-02 07:08:21 +05:30
parent 50db6a1d62
commit a1fc35fdf7
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/upload_recovery.rb
View File

@ -135,9 +135,16 @@ class UploadRecovery
@object_keys ||= begin
s3_helper = Discourse.store.s3_helper
s3_helper.list("original").map(&:key).concat(
s3_helper.list("#{FileStore::S3Store::TOMBSTONE_PREFIX}original").map(&:key)
)
if Rails.configuration.multisite
current_db = RailsMultisite::ConnectionManagement.current_db
s3_helper.list("uploads/#{current_db}/original").map(&:key).concat(
s3_helper.list("uploads/#{FileStore::S3Store::TOMBSTONE_PREFIX}#{current_db}/original").map(&:key)
)
else
s3_helper.list("original").map(&:key).concat(
s3_helper.list("#{FileStore::S3Store::TOMBSTONE_PREFIX}original").map(&:key)
)
end
end
@object_keys.each do |key|