sidekiq 0.11.2 → 1.0.0

data/Changes.md

@@ -1,3 +1,14 @@
+1.0.0
+-----------
+
+Thanks to all Sidekiq users and contributors for helping me
+get to this big milestone!
+
+- Default concurrency on client-side to 5, not 25 so we don't
+  create as many unused Redis connections, same as ActiveRecord's
+  default pool size.
+- Ensure redis= is given a Hash or ConnectionPool.
+
 0.11.2
 -----------
 

data/lib/sidekiq.rb

@@ -63,8 +63,10 @@ module Sidekiq
   def self.redis=(hash)
     if hash.is_a?(Hash)
       @redis = RedisConnection.create(hash)
-    else
+    elsif hash.is_a?(ConnectionPool)
       @redis = hash
+    else
+      raise ArgumentError, "redis= requires a Hash or ConnectionPool"
     end
   end
 

data/lib/sidekiq/cli.rb

@@ -64,9 +64,11 @@ module Sidekiq
         sleep
       rescue Interrupt
         logger.info 'Shutting down'
-        poller.terminate
+        poller.terminate if poller.alive?
         @manager.stop!(:shutdown => true, :timeout => options[:timeout])
         @manager.wait(:shutdown)
+        # Explicitly exit so busy Processor threads can't block
+        # process shutdown.
         exit(0)
       end
     end

data/lib/sidekiq/manager.rb

@@ -38,7 +38,6 @@ module Sidekiq
         timeout = options[:timeout]
 
         @done = true
-
         @fetcher.terminate if @fetcher.alive?
 
         logger.info { "Shutting down #{@ready.size} quiet workers" }
@@ -55,7 +54,7 @@ module Sidekiq
 
         return after(0) { signal(:shutdown) } if @busy.empty?
         logger.info { "Pausing up to #{timeout} seconds to allow workers to finish..." }
-        hard_shutdown_in(timeout) if shutdown
+        hard_shutdown_in timeout if shutdown
       end
     end
 
@@ -108,8 +107,8 @@ module Sidekiq
     private
 
     def hard_shutdown_in(delay)
-      watchdog("Manager#watch_for_shutdown died") do
-        after(delay) do
+      after(delay) do
+        watchdog("Manager#watch_for_shutdown died") do
           # We've reached the timeout and we still have busy workers.
           # They must die but their messages shall live on.
           logger.info("Still waiting for #{@busy.size} busy workers")

data/lib/sidekiq/redis_connection.rb

@@ -7,7 +7,7 @@ module Sidekiq
     def self.create(options={})
       url = options[:url] || ENV['REDISTOGO_URL'] || 'redis://localhost:6379/0'
       # need a connection for Fetcher and Retry
-      size = options[:size] || (Sidekiq.options[:concurrency] + 2)
+      size = options[:size] || (Sidekiq.server? ? (Sidekiq.options[:concurrency] + 2) : 5)
 
       ConnectionPool.new(:timeout => 1, :size => size) do
         build_client(url, options[:namespace])

data/lib/sidekiq/version.rb

@@ -1,3 +1,3 @@
 module Sidekiq
-  VERSION = "0.11.2"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-07 00:00:00.000000000 Z
+date: 2012-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70143968211720 !ruby/object:Gem::Requirement
+  requirement: &70330798429280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70143968211720
+  version_requirements: *70330798429280
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &70143968227640 !ruby/object:Gem::Requirement
+  requirement: &70330798428820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70143968227640
+  version_requirements: *70330798428820
 - !ruby/object:Gem::Dependency
   name: connection_pool
-  requirement: &70143968227140 !ruby/object:Gem::Requirement
+  requirement: &70330798428040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *70143968227140
+  version_requirements: *70330798428040
 - !ruby/object:Gem::Dependency
   name: celluloid
-  requirement: &70143968226640 !ruby/object:Gem::Requirement
+  requirement: &70330798427300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *70143968226640
+  version_requirements: *70330798427300
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70143968226260 !ruby/object:Gem::Requirement
+  requirement: &70330798426740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70143968226260
+  version_requirements: *70330798426740
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70143968225800 !ruby/object:Gem::Requirement
+  requirement: &70330798426000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70143968225800
+  version_requirements: *70330798426000
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70143968225380 !ruby/object:Gem::Requirement
+  requirement: &70330798425580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70143968225380
+  version_requirements: *70330798425580
 - !ruby/object:Gem::Dependency
   name: slim
-  requirement: &70143968224960 !ruby/object:Gem::Requirement
+  requirement: &70330798425160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70143968224960
+  version_requirements: *70330798425160
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70143968224540 !ruby/object:Gem::Requirement
+  requirement: &70330798424740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70143968224540
+  version_requirements: *70330798424740
 - !ruby/object:Gem::Dependency
   name: actionmailer
-  requirement: &70143968224040 !ruby/object:Gem::Requirement
+  requirement: &70330798424140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: *70143968224040
+  version_requirements: *70330798424140
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70143968223540 !ruby/object:Gem::Requirement
+  requirement: &70330798439980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,7 +131,7 @@ dependencies:
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: *70143968223540
+  version_requirements: *70330798439980
 description: Simple, efficient message processing for Ruby
 email:
 - mperham@gmail.com
@@ -149,7 +149,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- TODO.md
 - bin/client
 - bin/sidekiq
 - bin/sidekiqctl

data/TODO.md

@@ -1 +0,0 @@
-- Make the Web UI less ugly