add rack-timeout

This commit is contained in:
Konstantin Haase 2013-07-11 16:37:02 +02:00
parent 2909fe28a1
commit 60af7546a2
3 changed files with 7 additions and 0 deletions

View File

@ -15,6 +15,7 @@ gem 'yard-sinatra', github: 'rkh/yard-sinatra'
gem 'rack-contrib', github: 'rack/rack-contrib' gem 'rack-contrib', github: 'rack/rack-contrib'
gem 'rack-cache', '~> 1.2' gem 'rack-cache', '~> 1.2'
gem 'rack-attack' gem 'rack-attack'
gem 'rack-timeout'
gem 'gh' gem 'gh'
gem 'bunny' gem 'bunny'
gem 'dalli' gem 'dalli'

View File

@ -203,6 +203,7 @@ GEM
rack rack
rack-test (0.6.2) rack-test (0.6.2)
rack (>= 1.0) rack (>= 1.0)
rack-timeout (0.0.4)
railties (3.2.13) railties (3.2.13)
actionpack (= 3.2.13) actionpack (= 3.2.13)
activesupport (= 3.2.13) activesupport (= 3.2.13)
@ -293,6 +294,7 @@ DEPENDENCIES
rack-attack rack-attack
rack-cache (~> 1.2) rack-cache (~> 1.2)
rack-contrib! rack-contrib!
rack-timeout
rake (~> 0.9.2) rake (~> 0.9.2)
rb-fsevent (~> 0.9.1) rb-fsevent (~> 0.9.1)
rerun rerun

View File

@ -5,6 +5,7 @@ require 'rack/protection'
require 'rack/contrib' require 'rack/contrib'
require 'rack/cache' require 'rack/cache'
require 'rack/attack' require 'rack/attack'
require 'rack-timeout'
require 'active_record' require 'active_record'
require 'redis' require 'redis'
require 'gh' require 'gh'
@ -64,6 +65,9 @@ module Travis::Api
def initialize def initialize
@app = Rack::Builder.app do @app = Rack::Builder.app do
Rack::Timeout.timeout = 10
use Rack::Timeout
Rack::Utils::HTTP_STATUS_CODES[420] = "Enhance Your Calm" Rack::Utils::HTTP_STATUS_CODES[420] = "Enhance Your Calm"
use Rack::Attack use Rack::Attack
Rack::Attack.blacklist('block client requesting ruby builds') do |req| Rack::Attack.blacklist('block client requesting ruby builds') do |req|