pretty_timeouts 1.1 → 1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0f3c4e90786e50ee934e37c899f0163ba53e056
-  data.tar.gz: a8a440143d014a7c7de84d9e9c98e1ccdc6c78f3
+  metadata.gz: 13f3dbd2e2c184519f1177eed02cc04deb97ca57
+  data.tar.gz: 5b39bfc5385089f223e6744a326a625abd2ff09d
 SHA512:
-  metadata.gz: 8fd5f9c892e0cd82e906c7235b0d3111fa4e9970136f48aa895eefa2e2c853d0d3e2f59872f844db77eccdd8cce6b1a3361ca08308090370f7214c6b46952065
-  data.tar.gz: 44e6e3431ef5232334a5216d209690b116fceffa0ffbad66890e45b2058975b717df12cbb096bfe5891414b32c306261ce9345a44e82c3d32d5ddd4d9585eb32
+  metadata.gz: 419f0880525477e843ac486ecba52a6c18f70190fe34f77fac9bb9ea51d012fd30cd494a972be4e646f2d7c73ddf745edcbaf5a264cdfd399031c3ed1d4f8230
+  data.tar.gz: 64d374a6c13cdb4027ab28da00d64907c08d91aa91f44bd82d568f7a2d946866bea5fdaea15b4c03665a543f804df4739e9728b4c93ebe0e2ee13a000a755f39

data/CHANGELOG.md

@@ -5,5 +5,8 @@ CHANGELOG inspiration from http://keepachangelog.com/.
 
 ## Unreleased
 
+## [1.1] - March 17, 2016
+* Catch ConnectionFailed errors too
+
 ## [1.1] - March 17, 2016
 * Build error with info so that rescueing classes have more to work with.

data/lib/pretty_timeouts.rb

@@ -4,5 +4,6 @@ require "faraday"
 module PrettyTimeouts
 end
 
+require "pretty_timeouts/connection_failed"
 require "pretty_timeouts/timeout_error"
 require "pretty_timeouts/middleware"

data/lib/pretty_timeouts/connection_failed.rb

@@ -0,0 +1,16 @@
+module PrettyTimeouts
+  class ConnectionFailed < ::Faraday::Error::ConnectionFailed
+    attr_reader :service_name, :open_timeout, :url, :original_message
+
+    def initialize(service_name, open_timeout, url, original_message)
+      @service_name = service_name
+      @open_timeout = open_timeout
+      @url = url
+      @original_message = original_message
+    end
+
+    def message
+      "#{service_name} open timeout of #{open_timeout}s reached attempting to connect to #{url}. Got error: '#{original_message}'"
+    end
+  end
+end

data/lib/pretty_timeouts/middleware.rb

@@ -8,10 +8,11 @@ module PrettyTimeouts
     def call(env)
       begin
         @app.call(env)
-      rescue Faraday::Error::TimeoutError => e
-        error = ::PrettyTimeouts::TimeoutError.new(@service_name, env[:request][:timeout], env[:url])
-        error.set_backtrace e.backtrace
-        raise error
+      rescue Faraday::Error::TimeoutError
+        raise ::PrettyTimeouts::TimeoutError.new(@service_name, env[:request][:timeout], env[:url])
+
+      rescue Faraday::Error::ConnectionFailed => e
+        raise ::PrettyTimeouts::ConnectionFailed.new(@service_name, env[:request][:open_timeout], env[:url], e.message)
       end
     end
   end

data/lib/pretty_timeouts/version.rb

@@ -1,3 +1,3 @@
 module PrettyTimeouts
-  VERSION = "1.1"
+  VERSION = "1.2"
 end

data/pretty_timeouts.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "net-http-persistent"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pretty_timeouts
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: '1.2'
 platform: ruby
 authors:
 - Donald Plummer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2016-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: net-http-persistent
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - donald.plummer@gmail.com
@@ -84,6 +98,7 @@ files:
 - bin/console
 - bin/setup
 - lib/pretty_timeouts.rb
+- lib/pretty_timeouts/connection_failed.rb
 - lib/pretty_timeouts/middleware.rb
 - lib/pretty_timeouts/timeout_error.rb
 - lib/pretty_timeouts/version.rb