semian 0.7.9 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84a146123d366cf81b13b36d9038f7338722647a
-  data.tar.gz: 05cf06fd875a0b989d348c17bae7206b06bf07a4
+  metadata.gz: dd9c2d960a88c72716c280d2c26f8d81501bb090
+  data.tar.gz: f797fadf0c2848492fd22b291231b07bc63aa370
 SHA512:
-  metadata.gz: 286c3a3a02aa7ecc68dc673baf15ece2c0693b186378f939d2ea5d77f30fbca6eb4f64a3019ea44cae6a35e21c02d56afec4340b1db41e6b3a9b39d638692204
-  data.tar.gz: d2e1d56be8743f82bca4da45c632f5f0bfa23b36d137c1d11497455f60cd4d8faefc90416ee6941a788dfef1a604fae22e4ccb19379a2658431b01f314983d47
+  metadata.gz: cb62bd5e7269858b6f0a2108e3cab1e75a73e687daddad3f9c993b4be66768f59cdbbf38074bb4636def924521e537d1a9ce031b304efc12c61ed0f0b8694d35
+  data.tar.gz: 652545ff897ce72a76473075e2e71e8269655887bd360fce2ecf22c63c46ae38ca533357918df2fbf6a8b36712a9e9764f343691c9029871725934c204c63d8a

data/lib/semian.rb

@@ -244,6 +244,7 @@ module Semian
       error_threshold: options[:error_threshold],
       error_timeout: options[:error_timeout],
       exceptions: Array(exceptions) + [::Semian::BaseError],
+      half_open_resource_timeout: options[:half_open_resource_timeout],
       implementation: implementation,
     )
   end

data/lib/semian/adapter.rb

@@ -31,7 +31,7 @@ module Semian
 
     def acquire_semian_resource(scope:, adapter:, &block)
       return yield if resource_already_acquired?
-      semian_resource.acquire(scope: scope, adapter: adapter) do
+      semian_resource.acquire(scope: scope, adapter: adapter, resource: self) do
         mark_resource_as_acquired(&block)
       end
     rescue ::Semian::OpenCircuitError => error

data/lib/semian/circuit_breaker.rb

@@ -4,21 +4,22 @@ module Semian
 
     def_delegators :@state, :closed?, :open?, :half_open?
 
-    attr_reader :name
+    attr_reader :name, :half_open_resource_timeout
 
-    def initialize(name, exceptions:, success_threshold:, error_threshold:, error_timeout:, implementation:)
+    def initialize(name, exceptions:, success_threshold:, error_threshold:, error_timeout:, implementation:, half_open_resource_timeout: nil)
       @name = name.to_sym
       @success_count_threshold = success_threshold
       @error_count_threshold = error_threshold
       @error_timeout = error_timeout
       @exceptions = exceptions
+      @half_open_resource_timeout = half_open_resource_timeout
 
       @errors = implementation::SlidingWindow.new(max_size: @error_count_threshold)
       @successes = implementation::Integer.new
       @state = implementation::State.new
     end
 
-    def acquire
+    def acquire(resource = nil, &block)
       return yield if disabled?
 
       half_open if open? && error_timeout_expired?
@@ -27,7 +28,7 @@ module Semian
 
       result = nil
       begin
-        result = yield
+        result = maybe_with_half_open_resource_timeout(resource, &block)
       rescue *@exceptions => error
         mark_failed(error)
         raise error
@@ -122,5 +123,19 @@ module Semian
     def disabled?
       ENV['SEMIAN_CIRCUIT_BREAKER_DISABLED'] || ENV['SEMIAN_DISABLED']
     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
+        end
+      else
+        result = block.call
+      end
+
+      result
+    end
   end
 end

data/lib/semian/mysql2.rb

@@ -83,6 +83,22 @@ module Semian
       end
     end
 
+    # TODO: write_timeout and connect_timeout can't be configured currently
+    # dynamically, await https://github.com/brianmario/mysql2/pull/955
+    def with_resource_timeout(temp_timeout)
+      prev_read_timeout = @read_timeout
+
+      begin
+        # C-ext reads this directly, writer method will configure
+        # properly on the client but based on my read--this is good enough
+        # until we get https://github.com/brianmario/mysql2/pull/955 in
+        @read_timeout = temp_timeout
+        yield
+      ensure
+        @read_timeout = prev_read_timeout
+      end
+    end
+
     private
 
     def query_whitelisted?(sql, *)

data/lib/semian/protected_resource.rb

@@ -19,8 +19,8 @@ module Semian
       @circuit_breaker.destroy unless @circuit_breaker.nil?
     end
 
-    def acquire(timeout: nil, scope: nil, adapter: nil)
-      acquire_circuit_breaker(scope, adapter) do
+    def acquire(timeout: nil, scope: nil, adapter: nil, resource: nil)
+      acquire_circuit_breaker(scope, adapter, resource) do
         acquire_bulkhead(timeout, scope, adapter) do
           yield self
         end
@@ -29,11 +29,11 @@ module Semian
 
     private
 
-    def acquire_circuit_breaker(scope, adapter)
+    def acquire_circuit_breaker(scope, adapter, resource)
       if @circuit_breaker.nil?
         yield self
       else
-        @circuit_breaker.acquire do
+        @circuit_breaker.acquire(resource) do
           yield self
         end
       end

data/lib/semian/version.rb

@@ -1,3 +1,3 @@
 module Semian
-  VERSION = '0.7.9'
+  VERSION = '0.8.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: semian
 version: !ruby/object:Gem::Version
-  version: 0.7.9
+  version: 0.8.0
 platform: ruby
 authors:
 - Scott Francis
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-09 00:00:00.000000000 Z
+date: 2018-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -68,6 +68,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  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'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement