remove all calls to the distributed mutex in emojis

2015-02-13 19:34:24 +01:00 · 2015-02-13 19:34:24 +01:00 · 86c7071559
parent 324a3da723
commit 86c7071559
1 changed files with 3 additions and 5 deletions
--- a/app/models/emoji.rb
+++ b/app/models/emoji.rb
@ -85,11 +85,9 @@ class Emoji
  end

  def self.load_custom
-    DistributedMutex.new(EMOJIS_CUSTOM_LOCK).synchronize do
-      Dir.glob(File.join(Emoji.base_directory, "*.{png,gif}"))
-         .sort
-         .map { |emoji| Emoji.create_from_path(emoji) }
-    end
+    Dir.glob(File.join(Emoji.base_directory, "*.{png,gif}"))
+       .sort
+       .map { |emoji| Emoji.create_from_path(emoji) }
  end

  def self.base_directory