ironfan 4.9.4 → 4.9.5

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v4.9.5
+* generalizing tell_you_thrice from ec2/machine
+* cleaner message in rescue of tell_you_thrice
+
 # v4.9.4
 * ec2/machine: fixing debug output (duh)
 

data/VERSION

@@ -1 +1 @@
-4.9.4
+4.9.5

data/ironfan.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "ironfan"
-  s.version = "4.9.4"
+  s.version = "4.9.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Infochimps"]

data/lib/ironfan/provider/ec2/machine.rb

@@ -170,20 +170,11 @@ module Ironfan
             computer.machine = machine
             remember machine, :id => computer.name
 
-            # Trying a more brute force "I tell you 3 times", to get around
-            #   https://github.com/infochimps-labs/ironfan/issues/271
             Ironfan.step(fog_server.id,"waiting for machine to be ready", :gray)
-            begin
+            Ironfan.tell_you_thrice     :name           => fog_server.id,
+                                        :problem        => "server unavailable",
+                                        :error_class    => Fog::Errors::Error do
               fog_server.wait_for { ready? }
-            rescue Fog::Errors::Error => e
-              try ||= 0
-              raise if try > 3
-              try += 1
-              pause_for = 3 * try
-              Ironfan.step(fog_server.id,"rescue ##{try}, sleeping #{pause_for} seconds")
-              Chef::Log.debug "Error was #{e.inspect}"
-              sleep pause_for
-              retry
             end
           end
 

data/lib/ironfan.rb

@@ -141,6 +141,33 @@ module Ironfan
     end
   end
 
+  #
+  # Utility to retry a flaky operation three times, with ascending wait times
+  #
+  def self.tell_you_thrice(options={})
+    options = { name:           "problem",
+                problem:        nil,
+                error_class:    StandardError,
+                retries:        3,
+                multiplier:     3 }.merge!(options)
+    try     = 0
+    message = ''
+
+    begin
+      yield
+    rescue error_class => err
+      raise if try > retries
+      try += 1
+      pause_for = multiplier * try
+      message += "#{problem}, " unless problem.nil?
+      message += "sleeping #{pause_for} seconds"
+      Ironfan.step(name, message, :gray)
+      Chef::Log.debug "Error was #{err.inspect}"
+      sleep pause_for
+      retry
+    end
+  end
+
   #
   # Utility to show a step of the overall process
   #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ironfan
 version: !ruby/object:Gem::Version
-  version: 4.9.4
+  version: 4.9.5
   prerelease: 
 platform: ruby
 authors:
@@ -359,7 +359,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2624176669841722455
+      hash: -484279386276054459
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: