From a8ebc992730ab0368ef10aec33aceb39429448fd Mon Sep 17 00:00:00 2001 From: Marty Haught Date: Thu, 17 Sep 2015 14:49:50 -0600 Subject: [PATCH] Moved Rack::Timeout to production only for happier developing --- Gemfile | 2 +- config/environments/production.rb | 2 ++ config/initializers/timeout.rb | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) delete mode 100644 config/initializers/timeout.rb diff --git a/Gemfile b/Gemfile index 0d861a338..e1fb2847c 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,6 @@ ruby '2.2.3' gem 'rails', '4.1.2' gem 'puma', '~> 2.13' -gem 'rack-timeout', '~> 0.2.4' gem 'pg' @@ -32,6 +31,7 @@ gem 'zeroclipboard-rails' group :production do gem 'rails_12factor' + gem 'rack-timeout', '~> 0.2.4' end group :development do diff --git a/config/environments/production.rb b/config/environments/production.rb index 72f68899e..623833991 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -94,4 +94,6 @@ config.exceptions_app = self.routes config.time_zone = ENV['TIMEZONE'] || "Pacific Time (US & Canada)" + + Rack::Timeout.timeout = 15 end diff --git a/config/initializers/timeout.rb b/config/initializers/timeout.rb deleted file mode 100644 index a7c71bae8..000000000 --- a/config/initializers/timeout.rb +++ /dev/null @@ -1 +0,0 @@ -Rack::Timeout.timeout = 15 \ No newline at end of file