circuit_breakage 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5aeb1835130f99946eddad6d46d8f01dd44a0fed
-  data.tar.gz: bdd92ef38ba1a708da8ac1cab7e9bb34c1b4fe8d
+  metadata.gz: d59c7f0387657741b8cdb896c9fbc9bdeb130c09
+  data.tar.gz: d54f9a2a8c87fbb41c6d47d17d89e8c603b28062
 SHA512:
-  metadata.gz: 73d6b93182c3bd07d75196ac21c3fb7a7ca47259183c57a512ae131821eddfb035abc65509cd3d62a9cb3deae30f148aa3d352d9a12c4362e9297ddf397bcc18
-  data.tar.gz: f7f86f802260ab60af42d2db4031ac62110ff8081bcc681e74be062a4a376af5e00a721e33df9cd50f3dd14d33472710d70cf7fe7bdaf864de72cc41a444892a
+  metadata.gz: 36fd7a9668294099a94db646b5337bfa006ac50211113a357b2c37ad6b8be0b2007264e66a342280880630dcae20df289fcbada91f729eb96b2989cd3a5fe8fd
+  data.tar.gz: 3624cd0493809f40458e82d64aeef20ff3d55be24063eff796ae339896ba0a0ef24c2b2b8c1c1058ef50c043ff07725405beddb673490cbfa0834d3975ff505d

data/lib/circuit_breakage/breaker.rb

@@ -47,7 +47,7 @@ module CircuitBreakage
 
     def do_call(*args)
       ret_value = nil
-      Timeout.timeout(self.timeout, CircuitTimeout) do
+      Timeout.timeout(self.timeout) do
         ret_value = @block.call(*args)
       end
       handle_success
@@ -74,7 +74,15 @@ module CircuitBreakage
       end
 
       self.last_exception = error
-      raise(error)
+
+      if error.instance_of?(Timeout::Error)
+        # Raising an instance of Interrupt seems pretty rude, and there's no
+        # useful information in Timeout::Error anyway, so re-raise timeout
+        # errors as our own error class.
+        raise CircuitTimeout, "Circuit breaker timed out."
+      else
+        raise(error)
+      end
     end
   end
 end

data/lib/circuit_breakage/version.rb

@@ -1,3 +1,3 @@
 module CircuitBreakage
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: circuit_breakage
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - John Hyland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-01 00:00:00.000000000 Z
+date: 2015-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler