A platform for community discussion. Free, open, simple.
FIX: Avoid recursive letter avatar cleanup threads (#42568)
Alan Guo Xiang Taneec51faf1059
diff --git a/lib/discourse.rb b/lib/discourse.rbindex c6e6056dc9a..854de60df52 100644--- a/lib/discourse.rb+++ b/lib/discourse.rb@@ -1305,7 +1305,10 @@ module Discourserequire "actionview_precompiler"ActionviewPrecompiler.precompileend,- Thread.new { LetterAvatar.image_magick_version },+ Thread.new do+ LetterAvatar.image_magick_version+ LetterAvatar.cleanup_old+ end,Thread.new { SvgSprite.core_svgs },Thread.new { EmberAssets.script_chunks(exception: false) },Thread.new dodiff --git a/lib/letter_avatar.rb b/lib/letter_avatar.rbindex 81424e8fd81..4bbd22dc5e8 100644--- a/lib/letter_avatar.rb+++ b/lib/letter_avatar.rb@@ -110,15 +110,9 @@ class LetterAvatardef image_magick_version@image_magick_version ||=- begin- Thread.new do- sleep 2- cleanup_old- end- Digest::MD5.hexdigest(- ImageMagick.magick("--version") << ImageMagick.magick("-list", "font"),- )- end+ Digest::MD5.hexdigest(+ ImageMagick.magick("--version") << ImageMagick.magick("-list", "font"),+ )enddef cleanup_olddiff --git a/spec/lib/letter_avatar_spec.rb b/spec/lib/letter_avatar_spec.rbindex 9ffa639a5b6..9098bfcc25d 100644--- a/spec/lib/letter_avatar_spec.rb+++ b/spec/lib/letter_avatar_spec.rb@@ -5,14 +5,14 @@ require "letter_avatar"RSpec.describe LetterAvatar dodescribe ".cleanup_old" doit "removes stale cache directories" do- path = LetterAvatar.cache_path+ cache_path = LetterAvatar.cache_path+ parent_path = File.dirname(cache_path)+ stale_path = File.join(parent_path, "stale")+ FileUtils.mkdir_p([cache_path, stale_path])- FileUtils.mkdir_p(path + "junk")- LetterAvatar.generate("test", 100)+ described_class.cleanup_old- LetterAvatar.cleanup_old-- expect(Dir.entries(File.dirname(path)).length).to eq(3)+ expect(Dir.children(parent_path)).to contain_exactly(File.basename(cache_path))endend