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

Fix comments & straighten up conditional

Browse source
This commit is contained in:
jc00ke 2012-03-06 13:42:30 -08:00
parent 6b96a095fd
commit 05a8ab4d5a
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/sidekiq.rb
View file

@ -28,7 +28,7 @@ module Sidekiq
# Configuration for Sidekiq server, use like: # Configuration for Sidekiq server, use like:
# #
# Sidekiq.configure_server do |config| # 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| # config.server_middleware do |chain|
# chain.add MyServerHook # chain.add MyServerHook
# end # end
@ -41,7 +41,7 @@ module Sidekiq
# Configuration for Sidekiq client, use like: # Configuration for Sidekiq client, use like:
# #
# Sidekiq.configure_client do |config| # 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 # end
def self.configure_client def self.configure_client
yield self unless server? yield self unless server?
@ -56,16 +56,16 @@ module Sidekiq
end end
def self.redis=(hash) def self.redis=(hash)
if !hash.is_a?(Hash) @redis = if hash.is_a?(Hash)
RedisConnection.create(hash)
else
puts "***************************************************** puts "*****************************************************
Sidekiq.redis now takes a Hash: Sidekiq.redis now takes a Hash:
old: Sidekiq.redis = Sidekiq::RedisConnection.create(:url => 'redis://foo.com', :namespace => 'abc', :size => 12) 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 } new: Sidekiq.redis = { :url => 'redis://foo.com', :namespace => 'xyz', :size => 12 }
Called from #{caller[0]} Called from #{caller[0]}
*****************************************************" *****************************************************"
@redis = hash hash
else
@redis = RedisConnection.create(hash)
end end
end end