Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Revert unique retry job (#4937)

Browse source 
* Revert "Enable UniqueRetryJobMiddleware even when called from sidekiq worker (#4836)"

This reverts commit 6859d4c028.

* Revert "Do not execute the job with the same arguments as the retry job (#4814)"

This reverts commit be7ffa2d75.
This commit is contained in:
abcang 2017-09-14 22:12:43 +09:00 • committed by Eugen Rochko
parent 94fba44eec
commit 1aad015bbb
4 changed files with 1 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

20
lib/mastodon/unique_retry_job_middleware.rb
View file

@ -1,20 +0,0 @@
# frozen_string_literal: true
class Mastodon::UniqueRetryJobMiddleware
def call(_worker_class, item, _queue, _redis_pool)
return if item['unique_retry'] && retried?(item)
yield
end
private
def retried?(item)
# Use unique digest key of SidekiqUniqueJobs
unique_key = SidekiqUniqueJobs::UNIQUE_DIGEST_KEY
unique_digest = item[unique_key]
class_name = item['class']
retries = Sidekiq::RetrySet.new
retries.any? { |job| job.item['class'] == class_name && job.item[unique_key] == unique_digest }
end
end