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

Revert "revert fix to check if the added integration test will fall"

Browse source 
This reverts commit ecafd3f3c3.
This commit is contained in:
Nikolay Markov 2018-12-10 17:19:48 +03:00
parent ecafd3f3c3
commit c5104b9834
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/puma/server.rb
View file

@ -79,7 +79,6 @@ module Puma
@first_data_timeout = options.fetch(:first_data_timeout, FIRST_DATA_TIMEOUT) @first_data_timeout = options.fetch(:first_data_timeout, FIRST_DATA_TIMEOUT)
@binder = Binder.new(events) @binder = Binder.new(events)
@own_binder = true
@leak_stack_on_error = true @leak_stack_on_error = true
@ -102,7 +101,6 @@ module Puma
def inherit_binder(bind) def inherit_binder(bind)
@binder = bind @binder = bind
@own_binder = false
end end
def tcp_mode! def tcp_mode!
@ -271,10 +269,6 @@ module Puma
end end
@notify.close @notify.close
if @status != :restart and @own_binder
@binder.close
end
end end
@events.fire :state, :done @events.fire :state, :done
@ -430,10 +424,6 @@ module Puma
ensure ensure
@check.close @check.close
@notify.close @notify.close
if @status != :restart and @own_binder
@binder.close
end
end end
@events.fire :state, :done @events.fire :state, :done
@ -942,6 +932,10 @@ module Puma
@events.debug "Drained #{count} additional connections." @events.debug "Drained #{count} additional connections."
end end
if @status != :restart
@binder.close
end
if @thread_pool if @thread_pool
if timeout = @options[:force_shutdown_after] if timeout = @options[:force_shutdown_after]
@thread_pool.shutdown timeout.to_i @thread_pool.shutdown timeout.to_i