mirror of
https://github.com/mperham/sidekiq.git
synced 2022-11-09 13:52:34 -05:00
removing duplicated code
This commit is contained in:
parent
7ffc9947d1
commit
af6fe8fad4
1 changed files with 23 additions and 38 deletions
|
@ -87,11 +87,7 @@ module Sidekiq
|
||||||
params['key'].each do |key|
|
params['key'].each do |key|
|
||||||
job = Sidekiq::DeadSet.new.fetch(*parse_params(key)).first
|
job = Sidekiq::DeadSet.new.fetch(*parse_params(key)).first
|
||||||
next unless job
|
next unless job
|
||||||
if params['retry']
|
retry_or_delete job, params
|
||||||
job.retry
|
|
||||||
elsif params['delete']
|
|
||||||
job.delete
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
redirect_with_query("#{root_path}morgue")
|
redirect_with_query("#{root_path}morgue")
|
||||||
end
|
end
|
||||||
|
@ -109,13 +105,7 @@ module Sidekiq
|
||||||
post "/morgue/:key" do
|
post "/morgue/:key" do
|
||||||
halt 404 unless params['key']
|
halt 404 unless params['key']
|
||||||
job = Sidekiq::DeadSet.new.fetch(*parse_params(params['key'])).first
|
job = Sidekiq::DeadSet.new.fetch(*parse_params(params['key'])).first
|
||||||
if job
|
retry_or_delete job, params if job
|
||||||
if params['retry']
|
|
||||||
job.retry
|
|
||||||
elsif params['delete']
|
|
||||||
job.delete
|
|
||||||
end
|
|
||||||
end
|
|
||||||
redirect_with_query("#{root_path}morgue")
|
redirect_with_query("#{root_path}morgue")
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -140,11 +130,7 @@ module Sidekiq
|
||||||
params['key'].each do |key|
|
params['key'].each do |key|
|
||||||
job = Sidekiq::RetrySet.new.fetch(*parse_params(key)).first
|
job = Sidekiq::RetrySet.new.fetch(*parse_params(key)).first
|
||||||
next unless job
|
next unless job
|
||||||
if params['retry']
|
retry_or_delete job, params
|
||||||
job.retry
|
|
||||||
elsif params['delete']
|
|
||||||
job.delete
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
redirect_with_query("#{root_path}retries")
|
redirect_with_query("#{root_path}retries")
|
||||||
end
|
end
|
||||||
|
@ -162,13 +148,7 @@ module Sidekiq
|
||||||
post "/retries/:key" do
|
post "/retries/:key" do
|
||||||
halt 404 unless params['key']
|
halt 404 unless params['key']
|
||||||
job = Sidekiq::RetrySet.new.fetch(*parse_params(params['key'])).first
|
job = Sidekiq::RetrySet.new.fetch(*parse_params(params['key'])).first
|
||||||
if job
|
retry_or_delete job, params if job
|
||||||
if params['retry']
|
|
||||||
job.retry
|
|
||||||
elsif params['delete']
|
|
||||||
job.delete
|
|
||||||
end
|
|
||||||
end
|
|
||||||
redirect_with_query("#{root_path}retries")
|
redirect_with_query("#{root_path}retries")
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -191,13 +171,7 @@ module Sidekiq
|
||||||
|
|
||||||
params['key'].each do |key|
|
params['key'].each do |key|
|
||||||
job = Sidekiq::ScheduledSet.new.fetch(*parse_params(key)).first
|
job = Sidekiq::ScheduledSet.new.fetch(*parse_params(key)).first
|
||||||
if job
|
delete_or_add_queue job, params if job
|
||||||
if params['delete']
|
|
||||||
job.delete
|
|
||||||
elsif params['add_to_queue']
|
|
||||||
job.add_to_queue
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
redirect_with_query("#{root_path}scheduled")
|
redirect_with_query("#{root_path}scheduled")
|
||||||
end
|
end
|
||||||
|
@ -205,13 +179,7 @@ module Sidekiq
|
||||||
post "/scheduled/:key" do
|
post "/scheduled/:key" do
|
||||||
halt 404 unless params['key']
|
halt 404 unless params['key']
|
||||||
job = Sidekiq::ScheduledSet.new.fetch(*parse_params(params['key'])).first
|
job = Sidekiq::ScheduledSet.new.fetch(*parse_params(params['key'])).first
|
||||||
if job
|
delete_or_add_queue job, params if job
|
||||||
if params['add_to_queue']
|
|
||||||
job.add_to_queue
|
|
||||||
elsif params['delete']
|
|
||||||
job.delete
|
|
||||||
end
|
|
||||||
end
|
|
||||||
redirect_with_query("#{root_path}scheduled")
|
redirect_with_query("#{root_path}scheduled")
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -245,5 +213,22 @@ module Sidekiq
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def retry_or_delete job, params
|
||||||
|
if params['retry']
|
||||||
|
job.retry
|
||||||
|
elsif params['delete']
|
||||||
|
job.delete
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def delete_or_add_queue job, params
|
||||||
|
if params['delete']
|
||||||
|
job.delete
|
||||||
|
elsif params['add_to_queue']
|
||||||
|
job.add_to_queue
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Add table
Reference in a new issue