Moved Rack::Timeout to production only for happier developing

nodebr · Sep 17, 2015 · a8ebc99 · a8ebc99
1 parent 20f7bce
commit a8ebc99
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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