Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion lib/raven/configuration.rb
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,12 @@ class Configuration
# Should the SSL certificate of the server be verified?
attr_accessor :ssl_verification

# Ssl settings passed direactly to faraday's ssl option
# SSl settings passed direactly to faraday's ssl option
attr_accessor :ssl

# Proxy information to pass to the HTTP adapter
attr_accessor :proxy

attr_reader :current_environment

# The Faraday adapter to be used. Will default to Net::HTTP when not set.
Expand Down Expand Up @@ -106,6 +109,7 @@ def initialize
self.encoding = 'gzip'
self.timeout = 1
self.open_timeout = 1
self.proxy = nil
self.tags = {}
self.async = false
self.catch_debugged_exceptions = true
Expand Down
4 changes: 4 additions & 0 deletions lib/raven/transports/http.rb
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ def conn
builder.adapter(*adapter)
end

if self.configuration.proxy
conn.options[:proxy] = self.configuration.proxy
end

if self.configuration.timeout
conn.options[:timeout] = self.configuration.timeout
end
Expand Down