sharpetronics/faraday
1
0
Fork 0
mirror of https://github.com/lostisland/faraday.git synced 2025-10-18 00:02:44 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #66 from theflow/master

Browse Source 
pass timeouts to patron
This commit is contained in:
rick 2011-12-28 09:13:24 -08:00
commit b7df22ccde
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/faraday/adapter/patron.rb
View File

@ -11,6 +11,11 @@ module Faraday
session = ::Patron::Session.new session = ::Patron::Session.new
if req = env[:request]
session.timeout = session.connect_timeout = req[:timeout] if req[:timeout]
session.connect_timeout = req[:open_timeout] if req[:open_timeout]
end
response = begin response = begin
data = Connection::METHODS_WITH_BODIES.include?(env[:method]) ? env[:body].to_s : nil data = Connection::METHODS_WITH_BODIES.include?(env[:method]) ? env[:body].to_s : nil
session.request(env[:method], env[:url].to_s, env[:request_headers], :data => data) session.request(env[:method], env[:url].to_s, env[:request_headers], :data => data)