1
0
Fork 0
mirror of https://github.com/mperham/sidekiq.git synced 2022-11-09 13:52:34 -05:00

Merge branch 'master' of github.com:mperham/sidekiq

This commit is contained in:
Mike Perham 2014-09-17 10:39:41 -07:00
commit 9ada6e68f1
2 changed files with 3 additions and 6 deletions

View file

@ -133,14 +133,13 @@ module Sidekiq
end
get "/retries/:key" do
halt 404 unless params['key']
@retry = Sidekiq::RetrySet.new.fetch(*parse_params(params['key'])).first
redirect "#{root_path}retries" if @retry.nil?
erb :retry
end
post '/retries' do
halt 404 unless params['key']
redirect request.path unless params['key']
params['key'].each do |key|
job = Sidekiq::RetrySet.new.fetch(*parse_params(key)).first
@ -160,7 +159,6 @@ module Sidekiq
end
post "/retries/:key" do
halt 404 unless params['key']
job = Sidekiq::RetrySet.new.fetch(*parse_params(params['key'])).first
retry_or_delete_or_kill job, params if job
redirect_with_query("#{root_path}retries")
@ -174,14 +172,13 @@ module Sidekiq
end
get "/scheduled/:key" do
halt 404 unless params['key']
@job = Sidekiq::ScheduledSet.new.fetch(*parse_params(params['key'])).first
redirect "#{root_path}scheduled" if @job.nil?
erb :scheduled_job_info
end
post '/scheduled' do
halt 404 unless params['key']
redirect request.path unless params['key']
params['key'].each do |key|
job = Sidekiq::ScheduledSet.new.fetch(*parse_params(key)).first

View file

@ -11,7 +11,7 @@ end
gem 'rails', '~> 4.1.1'
gem 'sidekiq', :path => '..'
gem 'capistrano'
gem 'pry-byebug'
# sidekiq-web dependencies
gem 'sinatra'