ec2launcher 1.3.7 → 1.3.8

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.3.8
+
+* Make terminator code more threadsafe.
+
 ## 1.3.7
 
 * Added exponential back off to termination process.

data/bin/ec2launcher

@@ -28,7 +28,7 @@ if opt_parser.command == "init"
     puts "Successfully created #{opt_parser.location}"
 elsif opt_parser.command =~ /^term/
     terminator = EC2Launcher::Terminator.new
-    terminator.terminate(opt_parser.hostname, opt_parser.options)
+    terminator.terminate(opt_parser.hostname, opt_parser.options.access_key, opt_parser.options.secret_key)
 elsif opt_parser.command == "launch"
     launcher = EC2Launcher::Launcher.new
     launcher.launch(opt_parser.options)

data/lib/ec2launcher/terminator.rb

@@ -19,9 +19,7 @@ module EC2Launcher
       log_output = Outputter.stdout
       log_output.formatter = PatternFormatter.new :pattern => "%m"
       @log.outputters = log_output
-    end
 
-    def terminate(server_name, options)
       ##############################
       # Load configuration data
       ##############################
@@ -38,25 +36,32 @@ module EC2Launcher
         exit 2
       end
       @environment = @environments[options.environ]
-      
+    end
+
+    # Terminates a given server instance.
+    #
+    # @param[String] server_name Name of the server instance
+    # @param[String] access_key Amazon IAM access key
+    # @param[String] secret Amazon IAM secret key
+    def terminate(server_name, access_key, secret)
       ##############################
       # Initialize AWS and create EC2 connection
       ##############################
-      initialize_aws(options.access_key, options.secret)
-      @ec2 = AWS::EC2.new
+      initialize_aws(access_key, secret)
+      ec2 = AWS::EC2.new
       
       ##############################
       # Create Route53 connection
       ##############################
       aws_route53 = AWS::Route53.new if @environment.route53_zone_id
-      @route53 = EC2Launcher::Route53.new(aws_route53, @environment.route53_zone_id, @log)
+      route53 = EC2Launcher::Route53.new(aws_route53, @environment.route53_zone_id, @log)
 
       ##############################
       # Find instance
       ##############################
       instance = nil
       AWS.memoize do
-        instances = @ec2.instances.filter("tag:Name", server_name)
+        instances = ec2.instances.filter("tag:Name", server_name)
         instances.each do |i|
           unless i.status == :shutting_down || i.status == :terminated
             instance = i
@@ -72,9 +77,9 @@ module EC2Launcher
           instance.terminate
         end
 
-        if @route53
+        if route53
           @log.info("Deleting A record from Route53: #{server_name} => #{private_ip_address}")
-          @route53.delete_record_by_name(server_name, 'A')
+          route53.delete_record_by_name(server_name, 'A')
         end
 
         @log.info("Deleting node/client from Chef: #{server_name}")

data/lib/ec2launcher/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2launcher
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.3.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-15 00:00:00.000000000 Z
+date: 2012-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -111,4 +111,3 @@ signing_key:
 specification_version: 3
 summary: Tool to launch EC2 instances.
 test_files: []
-has_rdoc: