Remove rack-timeout (#7809)

Timeout considered harmful due to leaving the app in a broken
state, including unreaped database connections

diff --git a/Gemfile b/Gemfile
index cab4c413998eee7ddf516ce0e41138a16ef9b714..7a6e1568d28c355b09bc3d778b4c8c272c6135cf 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -66,7 +66,6 @@ gem 'pundit', '~> 1.1'
 gem 'premailer-rails'
 gem 'rack-attack', '~> 5.2'
 gem 'rack-cors', '~> 1.0', require: 'rack/cors'
-gem 'rack-timeout', '~> 0.4'
 gem 'rails-i18n', '~> 5.1'
 gem 'rails-settings-cached', '~> 0.6'
 gem 'redis', '~> 4.0', require: ['redis', 'redis/connection/hiredis']

diff --git a/Gemfile.lock b/Gemfile.lock
index f7a377d457b59d6659da58fa58721d3f6093347c..fd4452f7d5f8654dbe05ad56330425aefdf90c15 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -425,7 +425,6 @@ GEM
       rack
     rack-test (1.0.0)
       rack (>= 1.0, < 3)
-    rack-timeout (0.4.2)
     rails (5.2.0)
       actioncable (= 5.2.0)
       actionmailer (= 5.2.0)
@@ -726,7 +725,6 @@ DEPENDENCIES
   pundit (~> 1.1)
   rack-attack (~> 5.2)
   rack-cors (~> 1.0)
-  rack-timeout (~> 0.4)
   rails (~> 5.2.0)
   rails-controller-testing (~> 1.0)
   rails-i18n (~> 5.1)

diff --git a/config/initializers/timeout.rb b/config/initializers/timeout.rb
deleted file mode 100644 (file)
index de87fd9..0000000
--- a/config/initializers/timeout.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-Rack::Timeout::Logger.disable
-Rack::Timeout.service_timeout = false
-
-if Rails.env.production?
-  Rack::Timeout.service_timeout = 90
-end