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

Redis connection API change

old: Sidekiq.redis = Sidekiq::RedisConnection.create(:namespace => 'foo')
new: Sidekiq.redis = { :namespace => 'foo' }
This commit is contained in:
Mike Perham 2012-03-01 13:41:12 -08:00
parent 9c22f8d159
commit 0973245909
7 changed files with 23 additions and 10 deletions

View file

@ -55,8 +55,18 @@ module Sidekiq
@redis ||= Sidekiq::RedisConnection.create
end
def self.redis=(r)
@redis = r
def self.redis=(hash)
if !hash.is_a?(Hash)
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)
end
end
def self.client_middleware

View file

@ -1,6 +1,6 @@
Sidekiq.configure_client do |config|
config.redis = Sidekiq::RedisConnection.create(:namespace => 'resque', :size => 2)
config.redis = { :namespace => 'resque', :size => 2 }
end
Sidekiq.configure_server do |config|
config.redis = Sidekiq::RedisConnection.create(:namespace => 'resque', :size => 25)
config.redis = { :namespace => 'resque', :size => 25 }
end

View file

@ -5,7 +5,7 @@ require 'sidekiq/worker'
class TestClient < MiniTest::Unit::TestCase
describe 'with real redis' do
before do
Sidekiq.redis = Sidekiq::RedisConnection.create(:url => 'redis://localhost/sidekiq_test')
Sidekiq.redis = { :url => 'redis://localhost/sidekiq_test' }
Sidekiq.redis.flushdb
end
@ -39,7 +39,7 @@ class TestClient < MiniTest::Unit::TestCase
def @redis.setex(*); nil; end
def @redis.expire(*); true; end
def @redis.with_connection; yield self; end
Sidekiq.redis = @redis
Sidekiq.instance_variable_set(:@redis, @redis)
end
it 'raises ArgumentError with invalid params' do

View file

@ -10,7 +10,8 @@ class TestExtensions < MiniTest::Unit::TestCase
describe 'sidekiq extensions' do
before do
Sidekiq.client_middleware.entries.clear
Sidekiq.redis = @redis = MiniTest::Mock.new
Sidekiq.instance_variable_set(:@redis, MiniTest::Mock.new)
@redis = Sidekiq.redis
end
class MyModel < ActiveRecord::Base

View file

@ -8,7 +8,8 @@ require 'connection_pool'
class TestManager < MiniTest::Unit::TestCase
describe 'with redis' do
before do
Sidekiq.redis = @redis = Sidekiq::RedisConnection.create(:url => 'redis://localhost/sidekiq_test')
Sidekiq.redis = { :url => 'redis://localhost/sidekiq_test' }
@redis = Sidekiq.redis
@redis.flushdb
$processed = 0
$mutex = Mutex.new

View file

@ -6,7 +6,7 @@ require 'sidekiq/processor'
class TestMiddleware < MiniTest::Unit::TestCase
describe 'middleware chain' do
before do
Sidekiq.redis = Sidekiq::RedisConnection.create(:url => 'redis://localhost/sidekiq_test')
Sidekiq.redis = { :url => 'redis://localhost/sidekiq_test' }
end
class CustomMiddleware

View file

@ -5,7 +5,8 @@ require 'sidekiq/processor'
class TestStats < MiniTest::Unit::TestCase
describe 'with redis' do
before do
Sidekiq.redis = @redis = Sidekiq::RedisConnection.create(:url => 'redis://localhost/sidekiq_test')
Sidekiq.redis = { :url => 'redis://localhost/sidekiq_test' }
@redis = Sidekiq.redis
@redis.flushdb
end