From f295bf0530e4e4367ce05f132f1fe7bf2fc24c72 Mon Sep 17 00:00:00 2001 From: Nate Berkopec Date: Tue, 11 Oct 2016 12:17:30 -0600 Subject: [PATCH] Transport errors should raise Sentry errors, not Faraday --- lib/raven/transports/http.rb | 2 ++ spec/raven/transport_spec.rb | 0 spec/raven/transports/http_spec.rb | 6 ++++-- 3 files changed, 6 insertions(+), 2 deletions(-) delete mode 100644 spec/raven/transport_spec.rb diff --git a/lib/raven/transports/http.rb b/lib/raven/transports/http.rb index 93dd025fb..2f4688f53 100644 --- a/lib/raven/transports/http.rb +++ b/lib/raven/transports/http.rb @@ -23,6 +23,8 @@ def send_event(auth_header, data, options = {}) req.headers['X-Sentry-Auth'] = auth_header req.body = data end + rescue Faraday::ClientError => ex + raise Raven::Error, ex.message end private diff --git a/spec/raven/transport_spec.rb b/spec/raven/transport_spec.rb deleted file mode 100644 index e69de29bb..000000000 diff --git a/spec/raven/transports/http_spec.rb b/spec/raven/transports/http_spec.rb index 03b4391c9..8b0e374a0 100644 --- a/spec/raven/transports/http_spec.rb +++ b/spec/raven/transports/http_spec.rb @@ -1,3 +1,5 @@ +require 'spec_helper' + describe Raven::Transports::HTTP do before do Raven.configure do |config| @@ -16,7 +18,7 @@ Raven.configure { |config| config.http_adapter = [:test, stubs] } event = JSON.generate(Raven::Event.from_message("test").to_hash) - expect { Raven.client.send(:transport).send_event("test", event) }.to raise_error(Faraday::ResourceNotFound) + expect { Raven.client.send(:transport).send_event("test", event) }.to raise_error(Raven::Error) stubs.verify_stubbed_calls end @@ -28,7 +30,7 @@ Raven.configure { |config| config.http_adapter = [:test, stubs] } event = JSON.generate(Raven::Event.from_message("test").to_hash) - expect { Raven.client.send(:transport).send_event("test", event) }.to raise_error(Faraday::ClientError) + expect { Raven.client.send(:transport).send_event("test", event) }.to raise_error(Raven::Error) stubs.verify_stubbed_calls end