add rack-timeout

whatupdave · whatupdave · commit 10c809bf4dad · 2018-02-23T11:28:02.000-08:00
diff --git a/Gemfile b/Gemfile
@@ -1,14 +1,13 @@
 source 'https://rubygems.org'
 ruby "2.4.0"
 
-# gem 'rack-timeout'
 gem 'active_model_serializers', '~> 0.9.4'
 gem 'bcrypt', '~> 3.1.7'
 gem 'browser'
 gem 'bugsnag'
 gem 'capybara'
-gem 'carrierwave_backgrounder'
 gem 'carrierwave-aws'
+gem 'carrierwave_backgrounder'
 gem 'clearance'
 gem 'coffee-rails', '~> 4.1.0'
 gem 'connection_pool'
@@ -31,14 +30,15 @@ gem 'mini_racer'
 gem 'nokogiri', '~> 1.8.1'
 gem 'pg', '~> 0.15'
 gem 'poltergeist'
-gem 'puma_worker_killer'
 gem 'puma'
+gem 'puma_worker_killer'
 gem 'pusher'
 gem 'rack-cors'
 gem 'rack-mini-profiler', require: false
 gem 'rack-ssl-enforcer'
-gem 'rails_stdout_logging', group: [:development, :production]
+gem 'rack-timeout'
 gem 'rails', '~> 5.0.2'
+gem 'rails_stdout_logging', group: [:development, :production]
 gem 'react_on_rails'
 gem 'redcarpet', ">=3.3.4"
 gem 'sass-rails', '~> 5.0'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -241,6 +241,7 @@ GEM
     rack-ssl-enforcer (0.2.9)
     rack-test (0.6.3)
       rack (>= 1.0)
+    rack-timeout (0.4.2)
     rails (5.0.3)
       actioncable (= 5.0.3)
       actionmailer (= 5.0.3)
@@ -403,6 +404,7 @@ DEPENDENCIES
   rack-cors
   rack-mini-profiler
   rack-ssl-enforcer
+  rack-timeout
   rails (~> 5.0.2)
   rails-controller-testing
   rails_12factor
diff --git a/config/initializers/rack_timeout.rb b/config/initializers/rack_timeout.rb
@@ -1,5 +1 @@
-# if Rails.env.production?
-#   Rails.application.config.middleware.insert_before Rack::Runtime, Rack::Timeout, service_timeout: ENV.fetch('RACK_TIMEOUT', 5).to_i
-# end
-# Rack::Timeout::Logger.logger = Rails.logger
-# Rack::Timeout::Logger.level = Logger::Severity::WARN
+Rack::Timeout.service_timeout = ENV.fetch('RACK_TIMEOUT', 5).to_i
