Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

removing duplicated code #1702

Merged
merged 2 commits into from
May 13, 2014
Merged

removing duplicated code #1702

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af6fe8f
removing duplicated code
May 13, 2014
98211fa
normalize conditional on retry or delete call
May 13, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
63 changes: 23 additions & 40 deletions lib/sidekiq/web.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,7 @@ def custom_tabs

params['key'].each do |key|
job = Sidekiq::DeadSet.new.fetch(*parse_params(key)).first
next unless job
if params['retry']
job.retry
elsif params['delete']
job.delete
end
retry_or_delete job, params if job
end
redirect_with_query("#{root_path}morgue")
end
Expand All @@ -109,13 +104,7 @@ def custom_tabs
post "/morgue/:key" do
halt 404 unless params['key']
job = Sidekiq::DeadSet.new.fetch(*parse_params(params['key'])).first
if job
if params['retry']
job.retry
elsif params['delete']
job.delete
end
end
retry_or_delete job, params if job
redirect_with_query("#{root_path}morgue")
end

Expand All @@ -139,12 +128,7 @@ def custom_tabs

params['key'].each do |key|
job = Sidekiq::RetrySet.new.fetch(*parse_params(key)).first
next unless job
if params['retry']
job.retry
elsif params['delete']
job.delete
end
retry_or_delete job, params if job
end
redirect_with_query("#{root_path}retries")
end
Expand All @@ -162,13 +146,7 @@ def custom_tabs
post "/retries/:key" do
halt 404 unless params['key']
job = Sidekiq::RetrySet.new.fetch(*parse_params(params['key'])).first
if job
if params['retry']
job.retry
elsif params['delete']
job.delete
end
end
retry_or_delete job, params if job
redirect_with_query("#{root_path}retries")
end

Expand All @@ -191,27 +169,15 @@ def custom_tabs

params['key'].each do |key|
job = Sidekiq::ScheduledSet.new.fetch(*parse_params(key)).first
if job
if params['delete']
job.delete
elsif params['add_to_queue']
job.add_to_queue
end
end
delete_or_add_queue job, params if job
end
redirect_with_query("#{root_path}scheduled")
end

post "/scheduled/:key" do
halt 404 unless params['key']
job = Sidekiq::ScheduledSet.new.fetch(*parse_params(params['key'])).first
if job
if params['add_to_queue']
job.add_to_queue
elsif params['delete']
job.delete
end
end
delete_or_add_queue job, params if job
redirect_with_query("#{root_path}scheduled")
end

Expand Down Expand Up @@ -245,5 +211,22 @@ def custom_tabs
})
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