haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

core: Move FP collision leaser code to sep method so it works with alt impl

This commit is contained in:
Mitchell Hashimoto 2014-04-20 08:12:49 -07:00
parent bd7b458cbe
commit 49693a6af7
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/vagrant/action/builtin/handle_forwarded_port_collisions.rb
View File

@ -92,7 +92,10 @@ module Vagrant
end end
# If the port is open (listening for TCP connections) # If the port is open (listening for TCP connections)
if extra_in_use.include?(host_port) || port_checker[host_port] in_use = extra_in_use.include?(host_port) ||
port_checker[host_port] ||
lease_check(host_port)
if in_use
if !repair || !options[:auto_correct] if !repair || !options[:auto_correct]
raise Errors::ForwardPortCollision, raise Errors::ForwardPortCollision,
:guest_port => guest_port.to_s, :guest_port => guest_port.to_s,
@ -108,7 +111,10 @@ module Vagrant
usable_ports.delete(repaired_port) usable_ports.delete(repaired_port)
# If the port is in use, then we can't use this either... # If the port is in use, then we can't use this either...
if extra_in_use.include?(repaired_port) || port_checker[repaired_port] in_use = extra_in_use.include?(repaired_port) ||
port_checker[repaired_port] ||
lease_check(repaired_port)
if in_use
@logger.info("Reparied port also in use: #{repaired_port}. Trying another...") @logger.info("Reparied port also in use: #{repaired_port}. Trying another...")
next next
end end
@ -141,7 +147,7 @@ module Vagrant
@app.call(env) @app.call(env)
end end
def port_check(port) def lease_check(port)
# Check if this port is "leased". We use a leasing system of # Check if this port is "leased". We use a leasing system of
# about 60 seconds to avoid any forwarded port collisions in # about 60 seconds to avoid any forwarded port collisions in
# a highly parallelized environment. # a highly parallelized environment.
@ -170,7 +176,12 @@ module Vagrant
f.write(Time.now.to_i.to_s + "\n") f.write(Time.now.to_i.to_s + "\n")
end end
return is_port_open?("127.0.0.1", port) # Things look good to us!
false
end
def port_check(port)
is_port_open?("127.0.0.1", port)
end end
def with_forwarded_ports(env) def with_forwarded_ports(env)