Split configuration into configure_server and configure_client blocks.

lib/sidekiq.rb

@@ -25,15 +25,30 @@ module Sidekiq
   end
 
   ##
-  # Configuration for Sidekiq, use like:
+  # Configuration for Sidekiq server, use like:
   #
-  #   Sidekiq.configure do |config|
+  #   Sidekiq.configure_server do |config|
+  #     config.redis = Sidekiq::RedisConnection.create(:namespace => 'myapp', :size => 25, :url => 'redis://myhost:8877/mydb')
   #     config.server_middleware do |chain|
   #       chain.add MyServerHook
   #     end
   #   end
-  def self.configure
+  def self.configure_server
-    yield self
+    yield self if server?
+  end
+
+  ##
+  # 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')
+  #   end
+  def self.configure_client
+    yield self unless server?
+  end
+
+  def self.server?
+    defined?(Sidekiq::CLI)
   end
 
   def self.redis

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 => Sidekiq.options[:concurrency] || 25) { client } unless options[:use_pool] == false
+      return ConnectionPool.new(:timeout => 1, :size => (options[:size] || Sidekiq.options[:concurrency] || 25)) { client } unless options[:use_pool] == false
       client
     end
 

myapp/config/initializers/sidekiq.rb

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