Skip to content

Timeout #74

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

Closed
technicalpickles wants to merge 2 commits into from
Closed

Timeout #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
acaa3ff
Add support for custom timeouts
technicalpickles Mar 14, 2016
878b9de
Try to fix request options
technicalpickles Mar 14, 2016
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
4 changes: 4 additions & 0 deletions lib/slack/config.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,14 @@ module Config

attr_accessor :token
attr_accessor :logger
attr_accessor :timeout
attr_accessor :open_timeout

def reset
self.token = nil
self.logger = nil
self.timeout = nil
self.open_timeout = nil
end

reset
Expand Down
4 changes: 4 additions & 0 deletions lib/slack/web/faraday/connection.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ def connection
options[:headers]['User-Agent'] = user_agent if user_agent
options[:proxy] = proxy if proxy
options[:ssl] = { ca_path: ca_path, ca_file: ca_file }
request_options = {}
request_options[:timeout] = Slack::Config.timeout if Slack::Config.timeout
request_options[:open_timeout] = Slack::Config.open_timeout if Slack::Config.open_timeout
options[:request] = request_options

::Faraday::Connection.new(endpoint, options) do |connection|
connection.use ::Faraday::Request::Multipart
Expand Down