mirror of
https://github.com/mperham/sidekiq.git
synced 2022-11-09 13:52:34 -05:00
Execute shutdown event async from rest of system shutdown, fixes #2635
This commit is contained in:
parent
b0d606929d
commit
2022b6b68e
4 changed files with 7 additions and 2 deletions
|
@ -1,5 +1,10 @@
|
||||||
# Sidekiq Changes
|
# Sidekiq Changes
|
||||||
|
|
||||||
|
3.5.3
|
||||||
|
-----------
|
||||||
|
|
||||||
|
- Adjust shutdown event to run in parallel with the rest of system shutdown. [#2635]
|
||||||
|
|
||||||
3.5.2
|
3.5.2
|
||||||
-----------
|
-----------
|
||||||
|
|
||||||
|
|
|
@ -94,7 +94,6 @@ module Sidekiq
|
||||||
rescue Interrupt
|
rescue Interrupt
|
||||||
logger.info 'Shutting down'
|
logger.info 'Shutting down'
|
||||||
launcher.stop
|
launcher.stop
|
||||||
fire_event(:shutdown, true)
|
|
||||||
# Explicitly exit so busy Processor threads can't block
|
# Explicitly exit so busy Processor threads can't block
|
||||||
# process shutdown.
|
# process shutdown.
|
||||||
exit(0)
|
exit(0)
|
||||||
|
|
|
@ -52,6 +52,7 @@ module Sidekiq
|
||||||
poller.terminate if poller.alive?
|
poller.terminate if poller.alive?
|
||||||
|
|
||||||
manager.async.stop(:shutdown => true, :timeout => @options[:timeout])
|
manager.async.stop(:shutdown => true, :timeout => @options[:timeout])
|
||||||
|
fire_event(:shutdown, true)
|
||||||
@condvar.wait
|
@condvar.wait
|
||||||
manager.terminate
|
manager.terminate
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
module Sidekiq
|
module Sidekiq
|
||||||
VERSION = "3.5.2"
|
VERSION = "3.5.3"
|
||||||
end
|
end
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue