IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Make recover from tombstone script work for multisite.

Browse Source
This commit is contained in:
Guo Xiang Tan
2016-09-22 12:28:36 +08:00
parent 333d6f9f10
commit b5d6d3c326
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/tasks/uploads.rake
View File

@@ -406,9 +406,10 @@ def recover_from_tombstone
begin begin
original_setting = SiteSetting.max_image_size_kb original_setting = SiteSetting.max_image_size_kb
SiteSetting.max_image_size_kb = 10240 SiteSetting.max_image_size_kb = 10240
current_db = RailsMultisite::ConnectionManagement.current_db
public_path = Rails.root.join("public") public_path = Rails.root.join("public")
paths = Dir.glob("#{File.join(public_path, 'uploads', 'tombstone', '**', '*.*')}") paths = Dir.glob(File.join(public_path, 'uploads', 'tombstone', current_db, '**', '*.*'))
max = paths.length max = paths.length
paths.each_with_index do |path, index| paths.each_with_index do |path, index|
@@ -427,7 +428,7 @@ def recover_from_tombstone
upload = Upload.find_by(url: url) upload = Upload.find_by(url: url)
if !upload && url if !upload && url
printf "Restoring #{url}..." printf "Restoring #{path}..."
tombstone_path = File.join(public_path, 'uploads', 'tombstone', url.gsub(/^\/uploads\//, "")) tombstone_path = File.join(public_path, 'uploads', 'tombstone', url.gsub(/^\/uploads\//, ""))
if File.exists?(tombstone_path) if File.exists?(tombstone_path)