sidekiq 2.7.3 → 2.7.4

data/Changes.md

@@ -1,3 +1,8 @@
+2.7.4
+-----------
+
+- Fixed daemonization, was broken by some internal refactoring in 2.7.3 [#727]
+
 2.7.3
 -----------
 

data/lib/sidekiq/cli.rb

@@ -49,7 +49,6 @@ require 'erb'
 
 require 'sidekiq'
 require 'sidekiq/util'
-require 'sidekiq/launcher'
 
 module Sidekiq
   class CLI
@@ -90,6 +89,7 @@ module Sidekiq
         logger.info 'Starting processing, hit Ctrl-C to stop'
       end
 
+      require 'sidekiq/launcher'
       @launcher = Sidekiq::Launcher.new(options)
       launcher.procline(options[:tag] ? "#{options[:tag]} " : '')
 
@@ -121,6 +121,8 @@ module Sidekiq
     private
 
     def load_celluloid
+      raise "Celluloid cannot be required until here, or it will break Sidekiq's daemonization" if defined?(::Celluloid) && options[:daemon]
+
       # Celluloid can't be loaded until after we've daemonized
       # because it spins up threads and creates locks which get
       # into a very bad state if forked.

data/lib/sidekiq/launcher.rb

@@ -1,4 +1,3 @@
-
 require 'sidekiq/util'
 require 'sidekiq/manager'
 require 'sidekiq/scheduled'

data/lib/sidekiq/version.rb

@@ -1,3 +1,3 @@
 module Sidekiq
-  VERSION = "2.7.3"
+  VERSION = "2.7.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 2.7.3
+  version: 2.7.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - .public_cert.pem
-date: 2013-02-21 00:00:00.000000000 Z
+date: 2013-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -325,7 +325,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Simple, efficient message processing for Ruby