FIX: Avoid infinite loop if disk space is low

We now continue to enqueue the pull_hotlinked_images job for optimized images, even if disk space is low
This commit is contained in:
David Taylor
2019-06-07 14:09:02 +01:00
parent fca90106b9
commit e3a9a2d2dd
2 changed files with 10 additions and 6 deletions

View File

@ -627,7 +627,7 @@ class CookedPostProcessor
def pull_hotlinked_images(bypass_bump = false)
# have we enough disk space?
return if disable_if_low_on_disk_space
disable_if_low_on_disk_space # But still enqueue the job
# don't download remote images for posts that are more than n days old
return unless @post.created_at > (Date.today - SiteSetting.download_remote_images_max_days_old)
# we only want to run the job whenever it's changed by a user
@ -640,6 +640,7 @@ class CookedPostProcessor
end
def disable_if_low_on_disk_space
return false if !SiteSetting.download_remote_images_to_local
return false if available_disk_space >= SiteSetting.download_remote_images_threshold
SiteSetting.download_remote_images_to_local = false