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

Add ability to wakeup and cancel persistent connections

Browse source 
Without this, the graceful stop code has to wait for the persistent
timeout to expire even though there is actually no work going on.
This commit is contained in:
Evan Phoenix 2011-12-08 12:17:45 -08:00
parent 0985a07896
commit 3f529f0731
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

0
bin/pumactl Normal file → Executable file
View file

7
lib/puma/server.rb
View file

@ -52,6 +52,7 @@ module Puma
@thread_pool = nil
@persistent_timeout = PERSISTENT_TIMEOUT
@persistent_check, @persistent_wakeup = IO.pipe
@proto_env = {
"rack.version".freeze => Rack::VERSION,
@ -219,9 +220,11 @@ module Puma
env = @proto_env.dup
nparsed = 0
else
unless IO.select([client], nil, nil, @persistent_timeout)
unless ret = IO.select([client, @persistent_check], nil, nil, @persistent_timeout)
raise EOFError, "Timed out persistent connection"
end
return if ret.first.include? @persistent_check
end
else
# Parser is not done, queue up more data to read and continue parsing
@ -514,12 +517,14 @@ module Puma
# off the request queue before finally exiting.
#
def stop(sync=false)
@persistent_wakeup.close
@notify << STOP_COMMAND
@thread.join if @thread && sync
end
def halt(sync=false)
@persistent_wakeup.close
@notify << HALT_COMMAND
@thread.join if @thread && sync