Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Config first data timeout #1111

Merged
merged 2 commits into from Jun 4, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/puma/configuration.rb
Expand Up @@ -183,7 +183,8 @@ def default_options
:environment => lambda { ENV['RACK_ENV'] || "development" },
:rackup => DefaultRackup,
:logger => STDOUT,
:persistent_timeout => Const::PERSISTENT_TIMEOUT
:persistent_timeout => Const::PERSISTENT_TIMEOUT,
:first_data_timeout => Const::FIRST_DATA_TIMEOUT
}
end

Expand Down
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