Skip to content

Commit

Permalink
Permit the first_data_timeout setting to be overridden in the DSL
Browse files Browse the repository at this point in the history
  • Loading branch information
alexlance committed Oct 11, 2016
1 parent 3f66b3d commit 70b0560
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
6 changes: 6 additions & 0 deletions lib/puma/dsl.rb
Expand Up @@ -140,6 +140,12 @@ def persistent_timeout(seconds)
@options[:persistent_timeout] = seconds
end

# Define how long the tcp socket stays open, if no data has been received
#
def first_data_timeout(seconds)
@options[:first_data_timeout] = seconds
end

# Work around leaky apps that leave garbage in Thread locals
# across requests
#
Expand Down
3 changes: 1 addition & 2 deletions lib/puma/server.rb
Expand Up @@ -64,12 +64,11 @@ def initialize(app, events=Events.stdio, options={})
@thread_pool = nil

@persistent_timeout = options.fetch(:persistent_timeout, PERSISTENT_TIMEOUT)
@first_data_timeout = options.fetch(:first_data_timeout, FIRST_DATA_TIMEOUT)

@binder = Binder.new(events)
@own_binder = true

@first_data_timeout = FIRST_DATA_TIMEOUT

@leak_stack_on_error = true

@options = options
Expand Down

0 comments on commit 70b0560

Please sign in to comment.