discourse/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-09 14:34:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove all calls to the distributed mutex in emojis

Browse Source
This commit is contained in:
Régis Hanol 2015-02-13 19:34:24 +01:00
parent 324a3da723
commit 86c7071559
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/emoji.rb
View File

@ -85,12 +85,10 @@ class Emoji
end end
def self.load_custom def self.load_custom
DistributedMutex.new(EMOJIS_CUSTOM_LOCK).synchronize do
Dir.glob(File.join(Emoji.base_directory, "*.{png,gif}")) Dir.glob(File.join(Emoji.base_directory, "*.{png,gif}"))
.sort .sort
.map { |emoji| Emoji.create_from_path(emoji) } .map { |emoji| Emoji.create_from_path(emoji) }
end end
end
def self.base_directory def self.base_directory
"public/#{base_url}" "public/#{base_url}"