mirror/whippy-edition
1
0
Fork 0
mirror of https://github.com/whippyshou/mastodon synced 2024-12-18 08:38:47 +09:00
Code

Remove rack-timeout (#7809)

Browse Source 
Timeout considered harmful due to leaving the app in a broken
state, including unreaped database connections
This commit is contained in:
Eugen Rochko 2018-06-15 19:46:25 +02:00 committed by GitHub
parent ca85658975
commit 53f0452b70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Gemfile
View File

@ -66,7 +66,6 @@ gem 'pundit', '~> 1.1'
gem 'premailer-rails' gem 'premailer-rails'
gem 'rack-attack', '~> 5.2' gem 'rack-attack', '~> 5.2'
gem 'rack-cors', '~> 1.0', require: 'rack/cors' gem 'rack-cors', '~> 1.0', require: 'rack/cors'
gem 'rack-timeout', '~> 0.4'
gem 'rails-i18n', '~> 5.1' gem 'rails-i18n', '~> 5.1'
gem 'rails-settings-cached', '~> 0.6' gem 'rails-settings-cached', '~> 0.6'
gem 'redis', '~> 4.0', require: ['redis', 'redis/connection/hiredis'] gem 'redis', '~> 4.0', require: ['redis', 'redis/connection/hiredis']

2
Gemfile.lock
View File

@ -425,7 +425,6 @@ GEM
rack rack
rack-test (1.0.0) rack-test (1.0.0)
rack (>= 1.0, < 3) rack (>= 1.0, < 3)
rack-timeout (0.4.2)
rails (5.2.0) rails (5.2.0)
actioncable (= 5.2.0) actioncable (= 5.2.0)
actionmailer (= 5.2.0) actionmailer (= 5.2.0)
@ -726,7 +725,6 @@ DEPENDENCIES
pundit (~> 1.1) pundit (~> 1.1)
rack-attack (~> 5.2) rack-attack (~> 5.2)
rack-cors (~> 1.0) rack-cors (~> 1.0)
rack-timeout (~> 0.4)
rails (~> 5.2.0) rails (~> 5.2.0)
rails-controller-testing (~> 1.0) rails-controller-testing (~> 1.0)
rails-i18n (~> 5.1) rails-i18n (~> 5.1)

6
config/initializers/timeout.rb
View File

@ -1,6 +0,0 @@
Rack::Timeout::Logger.disable
Rack::Timeout.service_timeout = false
if Rails.env.production?
Rack::Timeout.service_timeout = 90
end