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

Clean up client option merging

Browse source
This commit is contained in:
Mike Perham 2012-04-29 13:22:39 -07:00
parent 7d5d171d12
commit c3c0dd1a93
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/sidekiq/client.rb
View file

@ -41,16 +41,10 @@ module Sidekiq
worker_class = item['class']
item['class'] = item['class'].to_s
item['retry'] = !!worker_class.get_sidekiq_options['retry']
queue = item['queue'] || worker_class.get_sidekiq_options['queue'] || 'default'
if !item['backtrace'] && worker_class.get_sidekiq_options['backtrace']
item['backtrace'] = worker_class.get_sidekiq_options['backtrace']
end
if !item['timeout'] && worker_class.get_sidekiq_options['timeout']
item['timeout'] = worker_class.get_sidekiq_options['timeout']
end
item = worker_class.get_sidekiq_options.merge(item)
item['retry'] = !!item['retry']
queue = item['queue']
pushed = false
Sidekiq.client_middleware.invoke(worker_class, item, queue) do