Skip to content
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.

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

Fixes #371 allow transparent proxy config in Net::HTTP via ENV #380

Merged
merged 1 commit into from
Nov 2, 2017
Merged
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
10 changes: 8 additions & 2 deletions lib/bugsnag/delivery/synchronous.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,13 @@ def deliver(url, body, configuration)

def request(url, body, configuration)
uri = URI.parse(url)
http = Net::HTTP.new(uri.host, uri.port, configuration.proxy_host, configuration.proxy_port, configuration.proxy_user, configuration.proxy_password)

if configuration.proxy_host
http = Net::HTTP.new(uri.host, uri.port, configuration.proxy_host, configuration.proxy_port, configuration.proxy_user, configuration.proxy_password)
else
http = Net::HTTP.new(uri.host, uri.port)
end

http.read_timeout = configuration.timeout
http.open_timeout = configuration.timeout

Expand All @@ -48,4 +54,4 @@ def path(uri)
end
end

Bugsnag::Delivery.register(:synchronous, Bugsnag::Delivery::Synchronous)
Bugsnag::Delivery.register(:synchronous, Bugsnag::Delivery::Synchronous)