capify-ec2 1.1.2 → 1.1.5

data/lib/capify-ec2.rb

@@ -3,11 +3,15 @@ require 'fog'
 
 class CapifyEc2
 
-  attr_accessor :ec2_config, :instance, :elb_name, :elb
+  attr_accessor :load_balancer
+  SLEEP_COUNT = 5
   
+  def self.ec2_config
+    YAML.load(File.new("config/ec2.yml"))
+  end  
+
   def self.running_instances
-    @ec2_config = YAML.load(File.new("config/ec2.yml"))
-    ec2 = Fog::Compute.new(:provider => 'AWS', :aws_access_key_id => @ec2_config[:aws_access_key_id], :aws_secret_access_key => @ec2_config[:aws_secret_access_key], :region => @ec2_config[:aws_params][:region])
+    ec2 = Fog::Compute.new(:provider => 'AWS', :aws_access_key_id => ec2_config[:aws_access_key_id], :aws_secret_access_key => ec2_config[:aws_secret_access_key], :region => ec2_config[:aws_params][:region])
     running_instances = ec2.servers.select {|instance| instance.state == "running"}
     running_instances.each do |instance|
       instance.instance_eval do
@@ -22,6 +26,10 @@ class CapifyEc2
     end
   end
   
+  def self.instance_health(load_balancer, instance)
+    elb.describe_instance_health(load_balancer.id, instance.id).body['DescribeInstanceHealthResult']['InstanceStates'][0]['State']
+  end
+  
   def self.get_instances_by_role(role)
     selected_instances = running_instances.select do |instance| 
       value = instance.case_insensitive_tag("Role")
@@ -40,38 +48,61 @@ class CapifyEc2
     running_instances.map {|instance| instance.name}
   end
   
-  def self.get_elb_name_by_instance(instance_id)
-    @elb = Fog::AWS::ELB.new(:aws_access_key_id => @ec2_config[:aws_access_key_id], :aws_secret_access_key => @ec2_config[:aws_secret_access_key], :region => @ec2_config[:aws_params][:region])
-    @elb.load_balancers.each do |load_balancer|
-      p load_balancer
-      load_balancer.instances.each {|instance| return load_balancer.id if instance_id == instance}
+  def self.elb
+    Fog::AWS::ELB.new(:aws_access_key_id => ec2_config[:aws_access_key_id], :aws_secret_access_key => ec2_config[:aws_secret_access_key], :region => ec2_config[:aws_params][:region])
+  end 
+  
+  def self.get_load_balancer_by_instance(instance_id)
+    hash = elb.load_balancers.inject({}) do |collect, load_balancer|
+      load_balancer.instances.each {|load_balancer_instance_id| collect[load_balancer_instance_id] = load_balancer}
+      collect
+    end
+    hash[instance_id]
+  end
+  
+  def self.get_load_balancer_by_name(load_balancer_name)
+    lbs = {}
+    elb.load_balancers.each do |load_balancer|
+      lbs[load_balancer.id] = load_balancer
     end
-    return nil
+    lbs[load_balancer_name]
+
   end
      
   def self.deregister_instance_from_elb(instance_name)
-    return unless @ec2_config[:load_balanced]
-    @instance = get_instance_by_name(instance_name).first
-    @elb_name = get_elb_name_by_instance(@instance.id)
-    @elb.deregister_instances_from_load_balancer(@instance.id, @elb_name) unless @elb_name.nil?
+    return unless ec2_config[:load_balanced]
+    instance = get_instance_by_name(instance_name).first
+    return if instance.nil?
+    @@load_balancer = get_load_balancer_by_instance(instance.id)
+    return if @@load_balancer.nil?
+
+    elb.deregister_instances_from_load_balancer(instance.id, @@load_balancer.id)
   end
   
-    def self.register_instance_in_elb
-      return unless @ec2_config[:load_balanced]
-      @elb.register_instances_with_load_balancer(@instance.id, @elb_name) unless @elb_name.nil?
-      state = @elb.describe_instance_health(@elb_name, @instance.id).body['DescribeInstanceHealthResult']['InstanceStates'][0]['State']
-      count = 0
-      sleepcount = 5
-      until (state == 'InService' || count == 6)
-        sleep sleepcount
-        count += 1
-        puts 'Verifying Instance Health'
-        state = @elb.describe_instance_health(@elb_name, @instance.id).body['DescribeInstanceHealthResult']['InstanceStates'][0]['State']
-      end
-      if state == 'InService'
-        puts "#{@instance.tags['Name']}: Healthy"
-      else
-        puts "#{@instance.tags['Name']}: tests timed out after #{count*sleepcount} seconds."
-      end
+  def self.register_instance_in_elb(instance_name, load_balancer_name = '')
+    return if !ec2_config[:load_balanced]
+    instance = get_instance_by_name(instance_name).first
+    return if instance.nil?
+    load_balancer =  get_load_balancer_by_name(load_balancer_name) || @@load_balancer
+    return if load_balancer.nil?
+
+    elb.register_instances_with_load_balancer(instance.id, load_balancer.id)
+
+    fail_after = ec2_config[:fail_after] || 30
+    state = instance_health(load_balancer, instance)
+    time_elapsed = 0
+    
+    while time_elapsed < fail_after
+      break if state == "InService"
+      sleep SLEEP_COUNT
+      time_elapsed += SLEEP_COUNT
+      STDERR.puts 'Verifying Instance Health'
+      state = instance_health(load_balancer, instance)
     end
-  end
+    if state == 'InService'
+      STDERR.puts "#{instance.name}: Healthy"
+    else
+      STDERR.puts "#{instance.name}: tests timed out after #{time_elapsed} seconds."
+    end
+  end
+end

data/lib/capify-ec2/capistrano.rb

@@ -37,7 +37,9 @@ Capistrano::Configuration.instance(:must_exist).load do
   end
   
   task :register_instance do
-    CapifyEc2.register_instance_in_elb
+    servers = variables[:logger].instance_variable_get("@options")[:actions].first
+    load_balancer_name = variables[:logger].instance_variable_get("@options")[:vars][:loadbalancer]
+    CapifyEc2.register_instance_in_elb(servers, load_balancer_name)
   end
   
   task :date do

data/lib/capify-ec2/version.rb

@@ -1,5 +1,5 @@
 module Capify
   module Ec2
-    VERSION = "1.1.2"
+    VERSION = "1.1.5"
   end
 end

data/readme.md

@@ -54,6 +54,19 @@ Running
 
 will run the date command on all server's tagged with the web role
 
+Running
+
+  cap server-1 register-instance -s loadbalancer=elb-1
+
+will register server-1 to be used by elb-1
+
+Running
+  
+  cap server-1 deregister-instance
+
+will remove server-1 from whatever instance it is currently
+registered against.
+
 More options
 ====================================================
 
@@ -90,11 +103,12 @@ The yml file needs to look something like this:
     	:aws_secret_access_key: "YOUR SECRET"
     	:aws_params:
     	  :region: 'eu-west-1'
-		:load_balanced: true
+		  :load_balanced: true
 
 The :aws_params are optional.
-If :load_balanced is set to true, the gem will deregister 
-the instance from the load balancer before deploying and
-reregister it after, using before and after deploy hooks.
+If :load_balanced is set to true, the gem uses pre and post-deploy
+hooks to deregister the instance, reregister it, and validate its
+health.
 :load_balanced only works for individual instances, not
-for roles.
+for roles.
+====================================================

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capify-ec2
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 25
   prerelease: false
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 5
+  version: 1.1.5
 platform: ruby
 authors: 
 - Noah Cantor
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-23 00:00:00 +01:00
+date: 2011-05-26 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency