mirror of
https://github.com/mperham/sidekiq.git
synced 2022-11-09 13:52:34 -05:00
Polish daemon fix [#727]
This commit is contained in:
parent
b7089ef746
commit
8f6a3b5561
3 changed files with 7 additions and 2 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
2.7.4
|
||||||
|
-----------
|
||||||
|
|
||||||
|
- Fixed daemonization, was broken by some internal refactoring in 2.7.3 [#727]
|
||||||
|
|
||||||
2.7.3
|
2.7.3
|
||||||
-----------
|
-----------
|
||||||
|
|
||||||
|
|
|
@ -121,7 +121,7 @@ module Sidekiq
|
||||||
private
|
private
|
||||||
|
|
||||||
def load_celluloid
|
def load_celluloid
|
||||||
raise "Celluloid cannot be required until here, or it will break Sidekiq's daemonization" if defined?(::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
|
# Celluloid can't be loaded until after we've daemonized
|
||||||
# because it spins up threads and creates locks which get
|
# because it spins up threads and creates locks which get
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
module Sidekiq
|
module Sidekiq
|
||||||
VERSION = "2.7.3"
|
VERSION = "2.7.4"
|
||||||
end
|
end
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue