Skip to content

Commit 1d671a7

Browse files
committed
Fix bad threading code
1 parent cdfad6f commit 1d671a7

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

lib/capify-ec2.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -312,8 +312,8 @@ def deregister_instance_from_named_elbs_by_dns(server_dns, load_balancer_names)
312312
threads = []
313313

314314
for load_balancer_name in load_balancer_names do
315-
threads << Thread.new({
316-
load_balancer = get_load_balancer_by_name(load_balancer_name)
315+
threads << Thread.new(load_balancer_name) do |lb|
316+
load_balancer = get_load_balancer_by_name(lb)
317317

318318
if load_balancer
319319
puts "[Capify-EC2] Removing instance from named ELB '#{load_balancer.id}'..."
@@ -323,7 +323,7 @@ def deregister_instance_from_named_elbs_by_dns(server_dns, load_balancer_names)
323323

324324
lbs << load_balancer
325325
end
326-
})
326+
end
327327
end
328328

329329
for t in threads do

lib/capify-ec2/capistrano.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -179,17 +179,17 @@ def capify_ec2
179179
threads = []
180180

181181
for load_balancer_to_reregister in load_balancers_to_reregister do
182-
threads << Thread.new({
183-
puts "[Capify-EC2] Starting registration of ELB '#{load_balancer_to_reregister.id}'"
182+
threads << Thread.new(load_balancer_to_reregister) do |lb|
183+
puts "[Capify-EC2] Starting registration of ELB '#{lb.id}'"
184184

185-
reregistered = capify_ec2.reregister_instance_with_elb_by_dns(server_dns, load_balancer_to_reregister, 60)
185+
reregistered = capify_ec2.reregister_instance_with_elb_by_dns(server_dns, lb, 60)
186186
if reregistered
187-
puts "[Capify-EC2] Instance registration with ELB '#{load_balancer_to_reregister.id}' successful.".green.bold
187+
puts "[Capify-EC2] Instance registration with ELB '#{lb.id}' successful.".green.bold
188188
else
189-
puts "[Capify-EC2] Instance registration with ELB '#{load_balancer_to_reregister.id}' failed!".red.bold
189+
puts "[Capify-EC2] Instance registration with ELB '#{lb.id}' failed!".red.bold
190190
raise CapifyEC2RollingDeployError.new("ELB registration timeout exceeded", server_dns)
191191
end
192-
})
192+
end
193193
end
194194

195195
for t in threads do

0 commit comments

Comments
 (0)