evt-retry 0.1.2.0 → 0.1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ead5a0d5b48258bfa2e98064a2c647fa6acf795149b68ec7ea73d94756b5b97f
-  data.tar.gz: 1d9aae6ee82c7dd3d38f3f102abc9a595e8eddd25fd0ff99a67d13b9b1610fee
+  metadata.gz: d0858ebb71e9f1bf0136bee2cd4a95e9bce3d2896afe53093fd6954323c60e2b
+  data.tar.gz: 7050a039f26137b3b54be6c854ee4f44b832d2e0698002dfa6d3d8b4b4ef67fc
 SHA512:
-  metadata.gz: 4c2af64e361bd3c9d50cedda46d6cdd598c28340c1aa1ab5b6141faf2db2070d48544f883d1a3133dc60b7494b3003cc9b7497595ef62a9746980a1a1f8a3fce
-  data.tar.gz: 532d792246a1b2980e57f2dafc07ea42db7f0c5cf63e752f25beb565211398b6a656b5cb20e93c4da90a3b45833aaa9a244977df7c2378d078fbf3f4892a8210
+  metadata.gz: 3c7fe677fee3673097930922eb50176d30e0cb94850213beb69c788b8a1a837071166c104e839ad6b732c03b4cc2d80b98ee1df4b0164997d1b4aa0cc5223423
+  data.tar.gz: 7fe3bd1a7868b0221ebc9ea18a516748fb1701840beea24c63d40429f8bf8130d92a07fe3af95733941714b839dfa0d7684954872d07e98984a3cc7cd231035b

data/lib/retry.rb

@@ -2,7 +2,9 @@ require 'try'
 require 'initializer'; Initializer.activate
 require 'dependency'; Dependency.activate
 require 'telemetry'
+require 'log'
 
+require 'retry/log'
 require 'retry/substitute'
 require 'retry/telemetry'
 require 'retry/retry'

data/lib/retry/log.rb

@@ -0,0 +1,9 @@
+class Retry
+  class Log < ::Log
+    def tag!(tags)
+      tags << :retry
+      tags << :library
+      tags << :verbose
+    end
+  end
+end

data/lib/retry/retry.rb

@@ -1,4 +1,5 @@
 class Retry
+  include Log::Dependency
   include ::Telemetry::Dependency
   extend Retry::Telemetry::Register
 
@@ -12,7 +13,7 @@ class Retry
   attr_writer :action_executed
 
   def self.build
-    new
+    instance = new
   end
 
   def self.configure(receiver, attr_name: nil)
@@ -31,37 +32,51 @@ class Retry
     errors = errors.flatten
     millisecond_intervals ||= [0]
 
+    logger.trace { "Starting retry (Errors: #{errors.join(', ')}, Millisecond Intervals: #{millisecond_intervals.join(', ')})" }
+
     intervals = millisecond_intervals.to_enum
 
-    retries = 0
+    cycle = 0
 
     error = nil
     probe = proc { |e| error = e }
 
     loop do
       success = Try.(errors, error_probe: probe) do
-        action.call(retries)
+        logger.debug { "Attempting (Cycle: #{cycle})" }
+        action.call(cycle)
       end
 
-      action_executed&.call(retries)
-
-      break if success
+      action_executed&.call(cycle)
 
-      retries += 1
+      if success
+        logger.debug { "Attempt succeed (Cycle: #{cycle})" }
+        break
+      end
 
       interval = intervals.next
 
-      telemetry.record :retried, Retry::Telemetry::Data.new(retries, error.class, interval)
+      logger.debug { "Attempt failed (Cycle: #{cycle}, Error: #{error.class.name})" }
+      telemetry.record :retried, Retry::Telemetry::Data.new(cycle, error.class, interval)
 
-      break if interval.nil?
+      if interval.nil?
+        logger.debug { "No more attempts. Intervals depleted." }
+        break
+      end
 
+      logger.debug { "Will retry. Sleeping #{interval} milliseconds before next attempt." }
       sleep (interval/1000.0)
+
+      cycle += 1
     end
 
     unless error.nil?
+      logger.debug { "All attempts failed. Will not retry. (Cycle: #{cycle}, Error: #{error.class.name})" }
       raise error
     end
 
-    retries
+    logger.info { "Attempt succeeded (Cycle: #{cycle})" }
+
+    cycle
   end
 end

data/lib/retry/telemetry.rb

@@ -6,7 +6,7 @@ class Retry
       record :retried
     end
 
-    Data = Struct.new :retry, :error, :millisecond_interval
+    Data = Struct.new :cycle, :error, :millisecond_interval
 
     def self.sink
       Sink.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-retry
 version: !ruby/object:Gem::Version
-  version: 0.1.2.0
+  version: 0.1.2.1
 platform: ruby
 authors:
 - The Eventide Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-13 00:00:00.000000000 Z
+date: 2018-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evt-try
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: evt-log
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: test_bench
   requirement: !ruby/object:Gem::Requirement
@@ -92,6 +106,7 @@ files:
 - lib/retry/controls/error.rb
 - lib/retry/controls/receiver.rb
 - lib/retry/controls/time.rb
+- lib/retry/log.rb
 - lib/retry/retry.rb
 - lib/retry/substitute.rb
 - lib/retry/telemetry.rb