about summary refs log tree commit diff
path: root/config
diff options
context:
space:
mode:
authorabcang <abcang1015@gmail.com>2017-09-06 03:56:20 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-09-05 20:56:20 +0200
commitbe7ffa2d7539d5a1946a3933cb9d242b9fac0ddc (patch)
tree7def482f34aed6f0bf079d3b277520023d181d59 /config
parente821c00e743160474072e78483f568dc4fdc6887 (diff)
Do not execute the job with the same arguments as the retry job (#4814)
Diffstat (limited to 'config')
-rw-r--r--config/application.rb1
-rw-r--r--config/initializers/sidekiq.rb3
2 files changed, 4 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb
index b6ce74147..f98f7af16 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -10,6 +10,7 @@ require_relative '../app/lib/exceptions'
 require_relative '../lib/paperclip/gif_transcoder'
 require_relative '../lib/paperclip/video_transcoder'
 require_relative '../lib/mastodon/version'
+require_relative '../lib/mastodon/unique_retry_job_middleware'
 
 Dotenv::Railtie.load
 
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index b70784d79..61e131336 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -13,4 +13,7 @@ end
 
 Sidekiq.configure_client do |config|
   config.redis = redis_params
+  config.client_middleware do |chain|
+    chain.add Mastodon::UniqueRetryJobMiddleware
+  end
 end