From 53f0452b70445831664431ef7720d8ec2d361656 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 15 Jun 2018 19:46:25 +0200
Subject: [PATCH] Remove rack-timeout (#7809)
Timeout considered harmful due to leaving the app in a broken
state, including unreaped database connections
---
Gemfile | 1 -
Gemfile.lock | 2 --
config/initializers/timeout.rb | 6 ------
3 files changed, 9 deletions(-)
delete mode 100644 config/initializers/timeout.rb
diff --git a/Gemfile b/Gemfile
index cab4c41399..7a6e1568d2 100644
--- 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 f7a377d457..fd4452f7d5 100644
--- 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
index de87fd906c..0000000000
--- 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
--
GitLab