sidekiq 1.1.0 → 1.1.1

data/Changes.md

@@ -1,4 +1,11 @@
-HEAD
+1.1.1
+-----------
+
+- Set procline for easy monitoring of Sidekiq status via "ps aux"
+- Fix race condition on shutdown [#134]
+- Fix hang with cap sidekiq:start [#131]
+
+1.1.0
 -----------
 
 - The Sidekiq license has switched from GPLv3 to LGPLv3!
@@ -24,7 +31,6 @@ Sidekiq.configure_server do |config|
 end
 ```
 
-
 1.0.0
 -----------
 

data/Gemfile

@@ -4,6 +4,8 @@ gemspec
 gem 'slim'
 gem 'sprockets'
 gem 'sass'
+gem 'rails'
+gem 'sqlite3'
 
 group :test do
   gem 'simplecov', :require => false

data/lib/sidekiq/capistrano.rb

@@ -1,6 +1,9 @@
 Capistrano::Configuration.instance.load do
-  before "deploy", "sidekiq:quiet"
-  after "deploy", "sidekiq:restart"
+  before "deploy",        "sidekiq:quiet"
+  after "deploy",         "sidekiq:restart"
+  after "deploy:stop",    "sidekiq:stop"
+  after "deploy:start",   "sidekiq:start"
+  after "deploy:restart", "sidekiq:restart"
 
   _cset(:sidekiq_timeout) { 10 }
   _cset(:sidekiq_role) { :app }
@@ -20,7 +23,7 @@ Capistrano::Configuration.instance.load do
     desc "Start sidekiq"
     task :start, :roles => lambda { fetch(:sidekiq_role) } do
       rails_env = fetch(:rails_env, "production")
-      run "cd #{current_path} ; nohup bundle exec sidekiq -e #{rails_env} -C #{current_path}/config/sidekiq.yml -P #{current_path}/tmp/pids/sidekiq.pid >> #{current_path}/log/sidekiq.log 2>&1 &"
+      run "cd #{current_path} ; nohup bundle exec sidekiq -e #{rails_env} -C #{current_path}/config/sidekiq.yml -P #{current_path}/tmp/pids/sidekiq.pid >> #{current_path}/log/sidekiq.log 2>&1 &", :pty => false
     end
 
     desc "Restart sidekiq"

data/lib/sidekiq/manager.rb

@@ -30,6 +30,7 @@ module Sidekiq
       @busy = []
       @fetcher = Fetcher.new(current_actor, options[:queues])
       @ready = @count.times.map { Processor.new_link(current_actor) }
+      procline
     end
 
     def stop(options={})
@@ -97,10 +98,20 @@ module Sidekiq
 
     def assign(msg, queue)
       watchdog("Manager#assign died") do
-        processor = @ready.pop
-        @in_progress[processor.object_id] = [msg, queue]
-        @busy << processor
-        processor.process!(MultiJson.decode(msg), queue)
+        if stopped?
+          # Race condition between Manager#stop if Fetcher
+          # is blocked on redis and gets a message after
+          # all the ready Processors have been stopped.
+          # Push the message back to redis.
+          Sidekiq.redis do |conn|
+            conn.lpush("queue:#{queue}", msg)
+          end
+        else
+          processor = @ready.pop
+          @in_progress[processor.object_id] = [msg, queue]
+          @busy << processor
+          processor.process!(MultiJson.decode(msg), queue)
+        end
       end
     end
 
@@ -142,5 +153,10 @@ module Sidekiq
     def stopped?
       @done
     end
+
+    def procline
+      $0 = "sidekiq #{Sidekiq::VERSION} [#{@busy.size} of #{@count} busy]"
+      after(5) { procline }
+    end
   end
 end

data/lib/sidekiq/version.rb

@@ -1,3 +1,3 @@
 module Sidekiq
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/lib/sidekiq/web.rb

@@ -21,7 +21,7 @@ module Sidekiq
     def call(env)
       # Solve the problem of people requesting /sidekiq when they need to request /sidekiq/ so
       # that relative links in templates resolve correctly.
-      return [301, { 'Location' => "#{env['SCRIPT_NAME']}/" }, []] if env['SCRIPT_NAME'] == env['REQUEST_PATH']
+      return [301, { 'Location' => "#{env['SCRIPT_NAME']}/" }, ['redirecting']] if env['SCRIPT_NAME'] == env['REQUEST_PATH']
 
       return @app.call(env) unless @matcher =~ env["PATH_INFO"]
       env['PATH_INFO'].sub!(@matcher,'')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-12 00:00:00.000000000 Z
+date: 2012-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70154555190180 !ruby/object:Gem::Requirement
+  requirement: &70138661617600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70154555190180
+  version_requirements: *70138661617600
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &70154555189740 !ruby/object:Gem::Requirement
+  requirement: &70138661617120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70154555189740
+  version_requirements: *70138661617120
 - !ruby/object:Gem::Dependency
   name: connection_pool
-  requirement: &70154555189240 !ruby/object:Gem::Requirement
+  requirement: &70138661616600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *70154555189240
+  version_requirements: *70138661616600
 - !ruby/object:Gem::Dependency
   name: celluloid
-  requirement: &70154555188740 !ruby/object:Gem::Requirement
+  requirement: &70138661616060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *70154555188740
+  version_requirements: *70138661616060
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70154555188360 !ruby/object:Gem::Requirement
+  requirement: &70138661615620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70154555188360
+  version_requirements: *70138661615620
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70154555204260 !ruby/object:Gem::Requirement
+  requirement: &70138661615140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70154555204260
+  version_requirements: *70138661615140
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70154555203840 !ruby/object:Gem::Requirement
+  requirement: &70138661614720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70154555203840
+  version_requirements: *70138661614720
 - !ruby/object:Gem::Dependency
   name: slim
-  requirement: &70154555203420 !ruby/object:Gem::Requirement
+  requirement: &70138661614300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70154555203420
+  version_requirements: *70138661614300
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70154555203000 !ruby/object:Gem::Requirement
+  requirement: &70138661613860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70154555203000
+  version_requirements: *70138661613860
 - !ruby/object:Gem::Dependency
   name: actionmailer
-  requirement: &70154555202500 !ruby/object:Gem::Requirement
+  requirement: &70138661610880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: *70154555202500
+  version_requirements: *70138661610880
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70154555202000 !ruby/object:Gem::Requirement
+  requirement: &70138661610140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,7 +131,7 @@ dependencies:
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: *70154555202000
+  version_requirements: *70138661610140
 description: Simple, efficient message processing for Ruby
 email:
 - mperham@gmail.com