network_resiliency 0.6.0 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9cd120266db1dfb8d2e5b37155534f3d5dc37a560d329352fa1a061ffd19ec97
-  data.tar.gz: c09fb2b6dc81e74a838e7da9ae9bc7e4d177c9ba7104a3b8e6ecb6b8668ebf97
+  metadata.gz: 5a2741f43768bd43985efdbf000fc82075d8fb2757e6af19a7ab0aeeae2f3a87
+  data.tar.gz: 713af5ee87ca4a8149a3ce3f5d9416eb2fa03cc0bdea7aca1828e18a59595003
 SHA512:
-  metadata.gz: 9caeeab2d22c4feea69b03438f8c66588179fe130ef1620935c475654a4661bbba36d82c79b4650fb3bcdead86cf0b5f3e3746513c40d16c8208b6f09ca32e5a
-  data.tar.gz: 05ad9ab8d5ec490cf6064cc83c54e9132b2a10f4bf6ab8ca0ab83f94d84db706622c951a49ad0de8e0ac7551ce32963fb86ca7aad5d6f47bb0c33162d3ba0e6d
+  metadata.gz: 6d80cac5009c100449adec47f70636dc015b069dbd6e3901545f6378841de9ad8970b2156d948c4e9ff4deb1cb579141167078032af6faa88270d88566f592e0
+  data.tar.gz: 7a9f01e6967657f61a40d80755d95f1c67387f598bfa73efb6d3d6f38661a7e17e5ccdf058834e3e8b09ba89bdb0d286019a4c3832b4d54908d044f5db9565e9

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+###  v0.6.2  (2023-11-26)
+- syncer
+- redis without_reconnect
+
+###  v0.6.1  (2023-11-21)
+- bugfix
+- redis system errors
+
 ###  v0.6.0  (2023-11-21)
 - http resiliency
 - redis resilience

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    network_resiliency (0.6.0)
+    network_resiliency (0.6.2)
 
 GEM
   remote: https://rubygems.org/

data/lib/network_resiliency/adapter/http.rb

@@ -50,6 +50,9 @@ module NetworkResiliency
             timeouts = timeouts.last(1)
           end
 
+          original_max_retries = self.max_retries
+          self.max_retries = 0 # disable
+
           attempts = 0
           ts = -NetworkResiliency.timestamp
 
@@ -73,6 +76,7 @@ module NetworkResiliency
           ensure
             ts += NetworkResiliency.timestamp
             set_timeout.call(original_timeout)
+            self.max_retries = original_max_retries
 
             NetworkResiliency.record(
               adapter: "http",
@@ -107,12 +111,7 @@ module NetworkResiliency
 
           idepotent = Net::HTTP::IDEMPOTENT_METHODS_.include?(req.method)
 
-          retries = self.max_retries
-          self.max_retries = 0 # disable
-
           with_resilience(:request, destination, idepotent) { super }
-        ensure
-          self.max_retries = retries
         end
       end
     end

data/lib/network_resiliency/adapter/redis.rb

@@ -82,12 +82,16 @@ module NetworkResiliency
 
             @options[timeout_key] = timeouts.shift
 
-            yield
-          rescue ::Redis::BaseConnectionError => e
+            without_reconnect { yield }
+          rescue ::Redis::BaseConnectionError, SystemCallError => e
             # capture error
 
             # grab underlying exception within Redis wrapper
-            error = e.cause.class
+            error = if e.is_a?(::Redis::BaseConnectionError)
+              e.cause.class
+            else
+              e.class
+            end
 
             retry if timeouts.size > 0
 

data/lib/network_resiliency/syncer.rb

@@ -0,0 +1,39 @@
+module NetworkResiliency
+  class Syncer < Thread
+    class << self
+      def start(redis)
+        @instance&.shutdown
+        @instance = new(redis)
+      end
+
+      def stop
+        @instance&.shutdown
+        @instance = nil
+      end
+    end
+
+    def initialize(redis)
+      @redis = redis
+
+      super { sync }
+    end
+
+    def shutdown
+      @shutdown = true
+
+      # prevent needless delay
+      raise Interrupt if status == "sleep"
+    end
+
+    private
+
+    def sync
+      until @shutdown
+        StatsEngine.sync(@redis)
+
+        sleep(3)
+      end
+    rescue Interrupt
+    end
+  end
+end

data/lib/network_resiliency/version.rb

@@ -1,3 +1,3 @@
 module NetworkResiliency
-  VERSION = "0.6.0"
+  VERSION = "0.6.2"
 end

data/lib/network_resiliency.rb

@@ -1,6 +1,7 @@
 require "network_resiliency/refinements"
 require "network_resiliency/stats"
 require "network_resiliency/stats_engine"
+require "network_resiliency/syncer"
 require "network_resiliency/version"
 
 using NetworkResiliency::Refinements
@@ -24,7 +25,7 @@ module NetworkResiliency
   def configure
     yield self if block_given?
 
-    start_syncing if redis
+    Syncer.start(redis) if redis
   end
 
   def patch(*adapters)
@@ -292,11 +293,7 @@ module NetworkResiliency
     @mode = nil
     Thread.current["network_resiliency"] = nil
     StatsEngine.reset
-
-    if @sync_worker
-      @sync_worker.kill
-      @sync_worker = nil
-    end
+    Syncer.stop
   end
 
   # private
@@ -304,18 +301,4 @@ module NetworkResiliency
   def thread_state
     Thread.current["network_resiliency"] ||= {}
   end
-
-  def start_syncing
-    @sync_worker.kill if @sync_worker
-
-    raise "Redis not configured" unless redis
-
-    @sync_worker = Thread.new do
-      loop do
-        StatsEngine.sync(redis)
-
-        sleep(3)
-      end
-    end
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: network_resiliency
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.2
 platform: ruby
 authors:
 - Daniel Pepper
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-21 00:00:00.000000000 Z
+date: 2023-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -198,6 +198,7 @@ files:
 - lib/network_resiliency/refinements.rb
 - lib/network_resiliency/stats.rb
 - lib/network_resiliency/stats_engine.rb
+- lib/network_resiliency/syncer.rb
 - lib/network_resiliency/version.rb
 - network_resiliency.gemspec
 homepage: https://github.com/dpep/network_resiliency_rb