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

don't use the original options in client_opts, it's being used for the pool

Browse source
This commit is contained in:
Salimane Adjao Moustapha 2013-10-21 21:36:51 +02:00
parent 5c538f9f12
commit b1fcb62ff7
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/sidekiq/redis_connection.rb
View file

@ -37,18 +37,19 @@ module Sidekiq
end end
def client_opts(options) def client_opts(options)
if options[:namespace] opts = options.dup
options.delete(:namespace) if opts[:namespace]
opts.delete(:namespace)
end end
if options[:network_timeout] if opts[:network_timeout]
options[:timeout] = options[:network_timeout] opts[:timeout] = opts[:network_timeout]
options.delete(:network_timeout) opts.delete(:network_timeout)
end end
options[:driver] = options[:driver] || 'ruby' opts[:driver] = opts[:driver] || 'ruby'
options opts
end end
def log_info(options) def log_info(options)