Skip to content

add read_timeout option #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
justcute wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add read_timeout option #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions lib/be_gateway/connection.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ def initialize(params)
@login = params.fetch(:shop_id)
@password = params.fetch(:secret_key)
@url = params.fetch(:url)
@read_timeout = params[:options]&.delete(:read_timeout)
@opts = params[:options] || {}
@rack_app = params[:rack_app]
@passed_headers = params[:headers]
Expand All @@ -24,7 +25,7 @@ def initialize(params)

private

attr_reader :login, :password, :url, :rack_app, :version
attr_reader :login, :password, :url, :rack_app, :version, :read_timeout

DEFAULT_OPEN_TIMEOUT = 5
DEFAULT_TIMEOUT = 25
Expand Down Expand Up @@ -80,7 +81,7 @@ def failed_response
def connection
@connection ||= Faraday::Connection.new(url, opts || {}) do |conn|
conn.options[:open_timeout] ||= DEFAULT_OPEN_TIMEOUT
conn.options[:timeout] ||= DEFAULT_TIMEOUT
conn.options[:timeout] ||= read_timeout || DEFAULT_TIMEOUT
conn.proxy ||= proxy if proxy # we use ||= to keep proxy passed within options
conn.headers = headers
conn.request :json
Expand Down
1 change: 1 addition & 0 deletions spec/be_gateway/connection_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
let(:proxy) { 'http://example.com' }

before { test_class.proxy = proxy }
before { params.merge!(options: { read_timeout: 60 }) }

it 'uses proxy' do
expect(subject.proxy.uri.to_s).to eq(proxy)
Expand Down