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

Attempting to debug why background jobs aren't always waited for

Browse source
This commit is contained in:
Daniel Shelton 2014-08-06 11:50:04 +01:00
parent df3f34e81c
commit af3d62c46a
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/puma/cluster.rb
View file

@ -195,7 +195,9 @@ module Puma
server = start_server
Signal.trap "SIGTERM" do
STDERR.puts "Got SIGTERM in worker"
server.stop
STDERR.puts "Finished processing SIGTERM in worker"
end
begin

4
lib/puma/server.rb
View file

@ -756,7 +756,7 @@ module Puma
# The server, in another thread, is shutting down
end
@thread.join if @thread && sync
(@thread.join and @thread = nil) if @thread && sync
end
def halt(sync=false)
@ -766,7 +766,7 @@ module Puma
# The server, in another thread, is shutting down
end
@thread.join if @thread && sync
(@thread.join and @thread = nil) if @thread && sync
end
def begin_restart