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

align default timeout value with value in default.env #137

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# v2.2.3
- Update `RACK_WAIT_TIMEOUT` on README and code to align with timeout value in default.env

# v2.2.2
- Drops Railtie::Database. STATEMENT_TIMEOUT no longer set by this gem.

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ Where `<%= variant %>` is the Rails version you'd like to test (e.g. `rails_5_2`
We'll insert the following middlewares into the rails stack:

1. `Rack::Timeout`: sets a timeout for all requests. Use `RACK_SERVICE_TIMEOUT`
(default 15) and `RACK_WAIT_TIMEOUT` (default 30) to customise.
(default 10) and `RACK_WAIT_TIMEOUT` (default 30) to customise.
2. `Rack::SslEnforcer`: enforces HTTPS.
3. `Rack::Deflater`: compresses responses from the application, can be disabled
with `ROO_ON_RAILS_RACK_DEFLATE` (default: 'YES').
Expand Down
2 changes: 1 addition & 1 deletion lib/roo_on_rails/railties/http.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class HTTP < Rails::Railtie
app.config.middleware.insert_before(
::Rack::Runtime,
::Rack::Timeout,
service_timeout: ENV.fetch('RACK_SERVICE_TIMEOUT', 15).to_i,
service_timeout: ENV.fetch('RACK_SERVICE_TIMEOUT', 10).to_i,
wait_timeout: ENV.fetch('RACK_WAIT_TIMEOUT', 30).to_i
)

Expand Down
2 changes: 1 addition & 1 deletion lib/roo_on_rails/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module RooOnRails
VERSION = '2.2.2'.freeze
VERSION = '2.2.3'.freeze
end