network_resiliency 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b05ddc43d74cc05325b32b3a45cbc1377bee1228c2c2f8ad7f2fd717ed7b49f
-  data.tar.gz: 8a9b5274e52a3ebc039f00e4aad18af9a7c2e645a7a246fd9e45cc474bbfb50b
+  metadata.gz: e8e570cbf267a9b9469004a731f7ea7379db90cee1b42fb15e18aae35d92d561
+  data.tar.gz: dc6e164d063b4266ca4ba36dd5ef8da210119c51058386eac7d997e38c6733bd
 SHA512:
-  metadata.gz: ffe3b488a66c2721a25a3a995a007ff89a822d4ea2b85638b370535a4895968c5e74084ef89ee7a9bc97a325beba410f74e4ce2ecf4c941e99b00bc3f07daf4a
-  data.tar.gz: 5632e5111b856b1fc9d34b31f8d099b584491dbb9beb623ddcff016a058b8f839900fe65554ef60619930843b5b98c4137b92f15722c5040547632b91ec5ac7e
+  metadata.gz: 3235234a8290a169e922f4b0531ee2d00dc398ad15d3c1a97fb7f2c1ffb79aa4f4c69d492e019e540fa005daaf08149b862ee26f156af34b014bbf0cf20c7c9c
+  data.tar.gz: 4f85c6de88904ab51fb4cf1804b3f3ec9b20441779e8e282baebc5eadb232d3c770b6f9a0f1f91d78afcb1256648dfa678803c46337b46049cf4b7b42b7267fb

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+###  v0.7.1  (2023-12-12)
+- observe! and fix mode recursion
+
 ###  v0.7.0  (2023-12-11)
 - proc support for mode
 - rails adapater and deadline

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    network_resiliency (0.7.0)
+    network_resiliency (0.7.1)
 
 GEM
   remote: https://rubygems.org/
@@ -87,16 +87,16 @@ GEM
     concurrent-ruby (1.2.2)
     connection_pool (2.4.1)
     crass (1.0.6)
-    datadog-ci (0.2.0)
+    datadog-ci (0.5.1)
       msgpack
     date (3.3.4)
-    ddtrace (1.15.0)
-      datadog-ci (~> 0.2.0)
-      debase-ruby_core_source (= 3.2.2)
+    ddtrace (1.18.0)
+      datadog-ci (~> 0.5.0)
+      debase-ruby_core_source (= 3.2.3)
       libdatadog (~> 5.0.0.1.0)
       libddwaf (~> 1.14.0.0.0)
       msgpack
-    debase-ruby_core_source (3.2.2)
+    debase-ruby_core_source (3.2.3)
     diff-lcs (1.5.0)
     docile (1.4.0)
     dogstatsd-ruby (4.8.3)

data/lib/network_resiliency/version.rb

@@ -1,3 +1,3 @@
 module NetworkResiliency
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

data/lib/network_resiliency.rb

@@ -66,8 +66,7 @@ module NetworkResiliency
 
     if @enabled.is_a?(Proc)
       # prevent recursive calls
-      enabled = @enabled
-      disable! { !!enabled.call(adapter) }
+      disable! { !!@enabled.call(adapter) }
     else
       @enabled
     end
@@ -84,7 +83,6 @@ module NetworkResiliency
   end
 
   def enable!
-    original = @enabled
     thread_state["enabled"] = true
 
     yield if block_given?
@@ -93,7 +91,6 @@ module NetworkResiliency
   end
 
   def disable!
-    original = @enabled
     thread_state["enabled"] = false
 
     yield if block_given?
@@ -111,8 +108,11 @@ module NetworkResiliency
       raise ArgumentError, "invalid NetworkResiliency action: #{action}"
     end
 
+    return thread_state[:mode] if thread_state.key?(:mode)
+
     mode = if @mode.is_a?(Proc)
-      @mode.call(action)
+      # prevent recursion
+      observe! { @mode.call(action) }
     elsif @mode
       @mode[action]
     end || :observe
@@ -164,7 +164,15 @@ module NetworkResiliency
       ACTIONS.each { |action| @mode[action] = mode }
     end
 
-    @mode.freeze
+    @mode.freeze if @mode.is_a?(Hash)
+  end
+
+  def observe!
+    thread_state[:mode] = :observe
+
+    yield if block_given?
+  ensure
+    thread_state.delete(:mode) if block_given?
   end
 
   def deadline

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: network_resiliency
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Daniel Pepper
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-11 00:00:00.000000000 Z
+date: 2023-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug