From 0a9a12cee8d2bed233c40dfc7cd88c97d7b9019d Mon Sep 17 00:00:00 2001
From: Mike Perham <mperham@gmail.com>
Date: Fri, 17 Feb 2012 13:51:46 -0800
Subject: [PATCH] Redis should be auto-initialized without any configuration on
 the client-side

---
 lib/sidekiq.rb                       | 7 +++++--
 lib/sidekiq/redis_connection.rb      | 2 +-
 myapp/config/initializers/sidekiq.rb | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/sidekiq.rb b/lib/sidekiq.rb
index 1b7e602e..76e47820 100644
--- a/lib/sidekiq.rb
+++ b/lib/sidekiq.rb
@@ -4,7 +4,10 @@ require 'sidekiq/worker'
 require 'sidekiq/rails' if defined?(::Rails)
 
 module Sidekiq
-  class << self
-    attr_accessor :redis
+  def self.redis
+    @redis ||= Sidekiq::RedisConnection.create
+  end
+  def self.redis=(r)
+    @redis = r
   end
 end
diff --git a/lib/sidekiq/redis_connection.rb b/lib/sidekiq/redis_connection.rb
index b7d69944..278f8943 100644
--- a/lib/sidekiq/redis_connection.rb
+++ b/lib/sidekiq/redis_connection.rb
@@ -6,7 +6,7 @@ module Sidekiq
     def self.create(options={})
       url = options[:url] || ENV['REDISTOGO_URL'] || 'redis://localhost:6379/0'
       client = build_client(url, options[:namespace])
-      return ConnectionPool.new(:timeout => 1, :size => 25) { client } unless options[:use_pool] == false
+      return ConnectionPool.new(:timeout => 1, :size => (options[:size] || 15)) { client } unless options[:use_pool] == false
       client
     end
 
diff --git a/myapp/config/initializers/sidekiq.rb b/myapp/config/initializers/sidekiq.rb
index f88bc4f0..742a1fbe 100644
--- a/myapp/config/initializers/sidekiq.rb
+++ b/myapp/config/initializers/sidekiq.rb
@@ -1 +1 @@
-Sidekiq.redis = Sidekiq::RedisConnection.create(:namespace => 'resque')
+Sidekiq.redis = Sidekiq::RedisConnection.create(:namespace => 'resque', :size => 5)