ec2launcher 1.3.5 → 1.3.7

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.3.7
+
+* Added exponential back off to termination process.
+
+## 1.3.6
+
+* Fixed error checking when deleting records from Route53 to be a little less aggressive.
+
 ## 1.3.5
 
 * Fixed typo.

data/lib/ec2launcher/route53.rb

@@ -8,8 +8,17 @@ require 'log4r'
 include Log4r
 
 module EC2Launcher
+  class Route53Record
+    attr_reader :name, :type, :ttl, :value
+    def initialize(name, type, ttl, value)
+      @name = name
+      @type = type
+      @ttl = ttl
+      @value = value
+    end
+  end
+
   class Route53
-    #
     # @param [AWS::Route53] route53 Initialized Route53 object
     # @param [String] hosted_zone_id Zone ID
     # @param [Log4r::Logger]
@@ -29,7 +38,7 @@ module EC2Launcher
     # @param [Integer] ttl  TTL in seconds. Defaults to 300.
     def create_record(name, value, type = "A", ttl = 300)
       # Delete existing record because you can't update records
-      delete_record_by_name(name, type)
+      delete_record_by_name(name, type, false)
 
       # Create new record
       begin
@@ -61,25 +70,13 @@ module EC2Launcher
     # @param [Boolean] log_errors Log errors or not. False quietly ignores errors.
     #
     def delete_record_by_name(hostname, record_type = "A", log_errors = true)
-      # Find the record
-      response = @route53.client.list_resource_record_sets({
-        :hosted_zone_id => @hosted_zone_id,
-        :start_record_name => hostname,
-        :start_record_type => record_type,
-        :max_items => 1
-      })
-
-      record_found = false
-      if response && response.data
-        if response.data[:resource_record_sets] && response.data[:resource_record_sets].size > 0
-          record = response.data[:resource_record_sets][0]
-          if record[:name] == hostname && record[:type] == record_type
-            record_found = true
-            delete_record(record[:name], record[:type], record[:ttl], record[:resource_records][0][:value], log_errors)
-          end
-        end
+      # Search for the record
+      record = find_record(hostname, record_type)
+      if record
+        delete_record(record.name, record.type, record.ttl, record.value, log_errors)
+      else
+        @log.warn "Route53 '#{record_type}' record for '#{hostname}' not found!" if log_errors
       end
-      @log.info("Route53 '#{record_type}' record for #{hostname} not found.") unless record_found
     end
 
     # Deletes a DNS record from Route53.
@@ -112,5 +109,34 @@ module EC2Launcher
         @log.error "Error deleting A record from Route53: #{bang}" if log_errors
       end
     end
+
+    # Searches for a record with the specified name and type.
+    #
+    # @param [String] name  Name of the record
+    # @param [String] type  Type of DNS record: A, CNAME, etc.
+    #
+    # @return [EC2Launcher::Route53Record] Wrapper containing all the
+    # required information about a Route53 entry or nil if not found.
+    def find_record(name, type = 'A')
+      # Find the record
+      response = @route53.client.list_resource_record_sets({
+        :hosted_zone_id => @hosted_zone_id,
+        :start_record_name => name,
+        :start_record_type => type,
+        :max_items => 1
+      })
+
+      record = nil
+      if response && response.data
+        if response.data[:resource_record_sets] && response.data[:resource_record_sets].size > 0
+          response_record = response.data[:resource_record_sets][0]
+          if (response_record[:name] == name || response_record[:name] == "#{name}.") && response_record[:type] == type
+            record = Route53Record.new(response_record[:name], response_record[:type], response_record[:ttl], response_record[:resource_records][0][:value])
+          end
+        end
+      end
+
+      record
+    end
   end
 end

data/lib/ec2launcher/terminator.rb

@@ -68,8 +68,9 @@ module EC2Launcher
       if instance
         private_ip_address = instance.private_ip_address
         
-        @log.info("Terminating instance: #{server_name} [#{instance.instance_id}]")
-        instance.terminate
+        run_with_backoff(30, 1, "terminating instance: #{server_name} [#{instance.instance_id}]") do
+          instance.terminate
+        end
 
         if @route53
           @log.info("Deleting A record from Route53: #{server_name} => #{private_ip_address}")

data/lib/ec2launcher/version.rb

@@ -2,5 +2,5 @@
 # Copyright (c) 2012 Sean Laurent
 #
 module EC2Launcher
-  VERSION = "1.3.5"
+  VERSION = "1.3.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2launcher
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-11 00:00:00.000000000 Z
+date: 2012-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk