will/aws-missing-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move elb timeout sleep outside of Timeout block

Browse Source
This commit is contained in:
Anuj Biyani 2013-06-04 18:33:47 -07:00
parent 7c6206e90d
commit abfa3d2885
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/aws-missing-tools/aws-ha-release/aws-ha-release.rb
View File

@ -107,11 +107,6 @@ module AwsMissingTools
puts "\nThe new instance was found to be healthy; one old instance will now be removed from the load balancers." puts "\nThe new instance was found to be healthy; one old instance will now be removed from the load balancers."
deregister_instance instance.ec2_instance, @group.load_balancers deregister_instance instance.ec2_instance, @group.load_balancers
puts "Sleeping for the ELB Timeout period of #{@opts[:elb_timeout]}"
sleep @opts[:elb_timeout]
puts "Instance #{instance.id} will now be terminated. By terminating this instance, the actual capacity will be decreased to 1 under desired-capacity."
instance.terminate false
end end
rescue Timeout::Error => e rescue Timeout::Error => e
puts "\nDuring the last #{time_taken} seconds, a new AutoScaling instance failed to become healthy." puts "\nDuring the last #{time_taken} seconds, a new AutoScaling instance failed to become healthy."
@ -126,6 +121,12 @@ module AwsMissingTools
raise raise
end end
puts "Sleeping for the ELB Timeout period of #{@opts[:elb_timeout]}"
sleep @opts[:elb_timeout]
puts "Instance #{instance.id} will now be terminated. By terminating this instance, the actual capacity will be decreased to 1 under desired-capacity."
instance.terminate false
end end
puts "\n#{@group.name} had its desired-capacity increased temporarily by 1 to a desired-capacity of #{@group.desired_capacity}." puts "\n#{@group.name} had its desired-capacity increased temporarily by 1 to a desired-capacity of #{@group.desired_capacity}."