diff --git a/lib/sidekiq.rb b/lib/sidekiq.rb index cb933c48..9e5a5773 100644 --- a/lib/sidekiq.rb +++ b/lib/sidekiq.rb @@ -28,7 +28,7 @@ module Sidekiq # Configuration for Sidekiq server, use like: # # Sidekiq.configure_server do |config| - # config.redis = Sidekiq::RedisConnection.create(:namespace => 'myapp', :size => 25, :url => 'redis://myhost:8877/mydb') + # config.redis = { :namespace => 'myapp', :size => 25, :url => 'redis://myhost:8877/mydb' } # config.server_middleware do |chain| # chain.add MyServerHook # end @@ -41,7 +41,7 @@ module Sidekiq # Configuration for Sidekiq client, use like: # # Sidekiq.configure_client do |config| - # config.redis = Sidekiq::RedisConnection.create(:namespace => 'myapp', :size => 1, :url => 'redis://myhost:8877/mydb') + # config.redis = { :namespace => 'myapp', :size => 1, :url => 'redis://myhost:8877/mydb' } # end def self.configure_client yield self unless server? @@ -56,16 +56,16 @@ module Sidekiq end def self.redis=(hash) - if !hash.is_a?(Hash) + @redis = if hash.is_a?(Hash) + RedisConnection.create(hash) + else puts "***************************************************** Sidekiq.redis now takes a Hash: old: Sidekiq.redis = Sidekiq::RedisConnection.create(:url => 'redis://foo.com', :namespace => 'abc', :size => 12) new: Sidekiq.redis = { :url => 'redis://foo.com', :namespace => 'xyz', :size => 12 } Called from #{caller[0]} *****************************************************" - @redis = hash - else - @redis = RedisConnection.create(hash) + hash end end