kotovalexarian-likes-github/puma--puma
1
0
Fork 0
mirror of https://github.com/puma/puma.git synced 2022-11-09 13:48:40 -05:00
Code Releases Activity

Make phased_restart fallback to restart if not available

Browse source
This commit is contained in:
Evan Phoenix 2013-07-18 17:09:18 -07:00
parent 0ded7fbbdd
commit 09eb0cc020
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/puma/cli.rb
View file

@ -463,6 +463,14 @@ module Puma
log "*** SIGUSR2 not implemented, signal based restart unavailable!"
end
begin
Signal.trap "SIGUSR1" do
phased_restart
end
rescue Exception
log "*** SIGUSR1 not implemented, signal based restart unavailable!"
end
begin
Signal.trap "SIGTERM" do
stop
@ -491,8 +499,8 @@ module Puma
end
def phased_restart
return false unless @runner.respond_to? :phased_restart
@runner.phased_restart
return restart unless @runner.respond_to? :phased_restart
return restart unless @runner.phased_restart
end
def stats

10
lib/puma/cluster.rb
View file

@ -233,16 +233,6 @@ module Puma
end
end
if preload?
Signal.trap "SIGUSR1" do
log "App preloaded, phased restart unavailable"
end
else
Signal.trap "SIGUSR1" do
phased_restart
end
end
# Used by the workers to detect if the master process dies.
# If select says that @check_pipe is ready, it's because the
# master has exited and @suicide_pipe has been automatically