ec2launcher 1.3.3 → 1.3.4

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.3.4
+
+* Additional error checking when deleting records from Route53.
+* More Route53 logging.
+
 ## 1.3.3
 
 * Added an extra newline after pre-commands in user-data.

data/lib/ec2launcher/route53.rb

@@ -68,13 +68,19 @@ module EC2Launcher
         :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]
-          delete_record(record[:name], record[:type], record[:ttl], record[:resource_records][0][:value], log_errors)
+          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
       end
     end
+    @log.info("Route53 '#{record_type}' record for #{hostname} not found.") unless record_found
 
     # Deletes a DNS record from Route53.
     #

data/lib/ec2launcher/terminator.rb

@@ -66,11 +66,13 @@ module EC2Launcher
       end # memoize
 
       if instance
+        private_ip_address = instance.private_ip_address
+        
         @log.info("Terminating instance: #{server_name} [#{instance.instance_id}]")
         instance.terminate
 
         if @route53
-          @log.info("Deleting A record from Route53: #{server_name} => #{instance.private_ip_address}")
+          @log.info("Deleting A record from Route53: #{server_name} => #{private_ip_address}")
           @route53.delete_record_by_name(server_name, 'A')
         end
 

data/lib/ec2launcher/version.rb

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

metadata

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