mirror of
https://github.com/puma/puma.git
synced 2022-11-09 13:48:40 -05:00
Revert "revert fix to check if the added integration test will fall"
This reverts commit ecafd3f3c3
.
This commit is contained in:
parent
ecafd3f3c3
commit
c5104b9834
1 changed files with 4 additions and 10 deletions
|
@ -79,7 +79,6 @@ module Puma
|
|||
@first_data_timeout = options.fetch(:first_data_timeout, FIRST_DATA_TIMEOUT)
|
||||
|
||||
@binder = Binder.new(events)
|
||||
@own_binder = true
|
||||
|
||||
@leak_stack_on_error = true
|
||||
|
||||
|
@ -102,7 +101,6 @@ module Puma
|
|||
|
||||
def inherit_binder(bind)
|
||||
@binder = bind
|
||||
@own_binder = false
|
||||
end
|
||||
|
||||
def tcp_mode!
|
||||
|
@ -271,10 +269,6 @@ module Puma
|
|||
end
|
||||
|
||||
@notify.close
|
||||
|
||||
if @status != :restart and @own_binder
|
||||
@binder.close
|
||||
end
|
||||
end
|
||||
|
||||
@events.fire :state, :done
|
||||
|
@ -430,10 +424,6 @@ module Puma
|
|||
ensure
|
||||
@check.close
|
||||
@notify.close
|
||||
|
||||
if @status != :restart and @own_binder
|
||||
@binder.close
|
||||
end
|
||||
end
|
||||
|
||||
@events.fire :state, :done
|
||||
|
@ -942,6 +932,10 @@ module Puma
|
|||
@events.debug "Drained #{count} additional connections."
|
||||
end
|
||||
|
||||
if @status != :restart
|
||||
@binder.close
|
||||
end
|
||||
|
||||
if @thread_pool
|
||||
if timeout = @options[:force_shutdown_after]
|
||||
@thread_pool.shutdown timeout.to_i
|
||||
|
|
Loading…
Add table
Reference in a new issue