semian 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36b4357747467cafab6b0c42471f8cfe169507aa
-  data.tar.gz: 5b1283ad1a0d7cd9df8b3e82ac14e73a89765d69
+  metadata.gz: f71cd497f50581f77346713c46ca0c441a28b483
+  data.tar.gz: c86d7dec61a304618f9b7adedc192e8d52fceba0
 SHA512:
-  metadata.gz: e9102fa0caff36c3bc4235a0a4e0df3eec20ae86b474ec9fea59c38cff3ae075d357cef424c7f820afddd70e423798c75a27c3a12c68e2204944359a406a9b1c
-  data.tar.gz: a29c0ab88f8c05c9111912ec20b61de5104fad3675997279e235a5adabc931811f8b58e71faca04742e5d5fe18885b6cf99b3ae622136e02d3fbf594aa95504e
+  metadata.gz: 9c0275ee9e483ce0a9accbf93ec59a93c97961b42d73dde6509cca45a245960f935b211107f03850eb172e07f4bc3b04b2855d423389255dc0d4d6abf72dc089
+  data.tar.gz: 64c9cc56813af4008f23fdd6e70fb9023f8e4b047846b892a7ad23b27a6444df9de2999f8422c266bd8bc918642ae8626174fe8adb8e4d24befbcb554f984d5a

data/lib/semian/adapter.rb

@@ -35,7 +35,12 @@ module Semian
         mark_resource_as_acquired(&block)
       end
     rescue ::Semian::OpenCircuitError => error
-      raise self.class::CircuitOpenError.new(semian_identifier, error.message)
+      begin
+        raise semian_resource.circuit_breaker.last_error
+      rescue
+        last_error_message = semian_resource.circuit_breaker.last_error.message
+        raise self.class::CircuitOpenError.new(semian_identifier, "#{error.message} caused by #{last_error_message}")
+      end
     rescue ::Semian::BaseError => error
       raise self.class::ResourceBusyError.new(semian_identifier, error.message)
     rescue *resource_exceptions => error

data/lib/semian/circuit_breaker.rb

@@ -2,9 +2,9 @@ module Semian
   class CircuitBreaker #:nodoc:
     extend Forwardable
 
-    def_delegators :@state, :closed?, :open?, :half_open!
+    def_delegators :@state, :closed?, :open?, :half_open?
 
-    attr_reader :name, :half_open_resource_timeout
+    attr_reader :name, :half_open_resource_timeout, :error_timeout, :state, :last_error
 
     def initialize(name, exceptions:, success_threshold:, error_threshold:, error_timeout:, implementation:, half_open_resource_timeout: nil)
       @name = name.to_sym
@@ -21,7 +21,7 @@ module Semian
 
     def acquire(resource = nil, &block)
       return yield if disabled?
-      half_open! if half_open?
+      transition_to_half_open if transition_to_half_open?
 
       raise OpenCircuitError unless request_allowed?
 
@@ -37,33 +37,34 @@ module Semian
       result
     end
 
-    def half_open?
-      (open? && error_timeout_expired?) || @state.half_open?
+    def transition_to_half_open?
+      open? && error_timeout_expired? && !half_open?
     end
 
     def request_allowed?
-      closed? || half_open?
+      closed? || half_open? || transition_to_half_open?
     end
 
-    def mark_failed(_error)
+    def mark_failed(error)
+      push_error(error)
       push_time(@errors)
       if closed?
-        open if error_threshold_reached?
+        transition_to_open if error_threshold_reached?
       elsif half_open?
-        open
+        transition_to_open
       end
     end
 
     def mark_success
       return unless half_open?
       @successes.increment
-      close if success_threshold_reached?
+      transition_to_close if success_threshold_reached?
     end
 
     def reset
       @errors.clear
       @successes.reset
-      close
+      transition_to_close
     end
 
     def destroy
@@ -74,20 +75,20 @@ module Semian
 
     private
 
-    def close
+    def transition_to_close
       log_state_transition(:closed)
-      @state.close
+      @state.close!
       @errors.clear
     end
 
-    def open
+    def transition_to_open
       log_state_transition(:open)
-      @state.open
+      @state.open!
     end
 
-    def half_open
+    def transition_to_half_open
       log_state_transition(:half_open)
-      @state.half_open
+      @state.half_open!
       @successes.reset
     end
 
@@ -105,6 +106,10 @@ module Semian
       Time.at(last_error_time) + @error_timeout < Time.now
     end
 
+    def push_error(error)
+      @last_error = error
+    end
+
     def push_time(window, time: Time.now)
       window.reject! { |err_time| err_time + @error_timeout < time.to_i }
       window << time.to_i
@@ -125,15 +130,14 @@ module Semian
     end
 
     def maybe_with_half_open_resource_timeout(resource, &block)
-      result = nil
-
-      if half_open? && @half_open_resource_timeout && resource.respond_to?(:with_resource_timeout)
-        resource.with_resource_timeout(@half_open_resource_timeout) do
-          result = block.call
+      result =
+        if half_open? && @half_open_resource_timeout && resource.respond_to?(:with_resource_timeout)
+          resource.with_resource_timeout(@half_open_resource_timeout) do
+            block.call
+          end
+        else
+          block.call
         end
-      else
-        result = block.call
-      end
 
       result
     end

data/lib/semian/net_http.rb

@@ -90,6 +90,19 @@ module Semian
       end
     end
 
+    def with_resource_timeout(timeout)
+      prev_read_timeout = read_timeout
+      prev_open_timeout = open_timeout
+      begin
+        self.read_timeout = timeout
+        self.open_timeout = timeout
+        yield
+      ensure
+        self.read_timeout = prev_read_timeout
+        self.open_timeout = prev_open_timeout
+      end
+    end
+
     private
 
     def handle_error_responses(result)

data/lib/semian/redis.rb

@@ -85,7 +85,7 @@ module Semian
         begin
           raw_connect
         rescue SocketError, RuntimeError => e
-          raise ResolveError.new(semian_identifier) if e.message =~ /(can't resolve)|(name or service not known)/i
+          raise ResolveError.new(semian_identifier) if e.cause.to_s =~ /(can't resolve)|(name or service not known)/i
           raise
         end
       end

data/lib/semian/simple_state.rb

@@ -19,11 +19,11 @@ module Semian
         value == :half_open
       end
 
-      def open
+      def open!
         @value = :open
       end
 
-      def close
+      def close!
         @value = :closed
       end
 
@@ -32,7 +32,7 @@ module Semian
       end
 
       def reset
-        close
+        close!
       end
 
       def destroy

data/lib/semian/version.rb

@@ -1,3 +1,3 @@
 module Semian
-  VERSION = '0.8.3'
+  VERSION = '0.8.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: semian
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Scott Francis
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-20 00:00:00.000000000 Z
+date: 2018-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler