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: Don't raise an error cleaning up uploads if a path is nil

Browse Source
This commit is contained in:
Robin Ward 2017-06-08 14:31:58 -04:00
parent 602e4d0da4
commit d92c938491
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/jobs/scheduled/clean_up_uploads.rb
View File

@ -16,9 +16,13 @@ module Jobs
SiteSetting.favicon_url, SiteSetting.favicon_url,
SiteSetting.apple_touch_icon_url, SiteSetting.apple_touch_icon_url,
].map do |url| ].map do |url|
url = url.dup if url.present?
url.gsub!(s3_cdn_hostname, s3_hostname) if s3_cdn_hostname.present? url = url.dup
url[base_url] && url[url.index(base_url)..-1] url.gsub!(s3_cdn_hostname, s3_hostname) if s3_cdn_hostname.present?
url[base_url] && url[url.index(base_url)..-1]
else
nil
end
end.compact.uniq end.compact.uniq
grace_period = [SiteSetting.clean_orphan_uploads_grace_period_hours, 1].max grace_period = [SiteSetting.clean_orphan_uploads_grace_period_hours, 1].max