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

core: port collision detector can swap open port checker

This commit is contained in:
Mitchell Hashimoto 2014-04-17 14:50:52 -07:00
parent 4dabfc1aff
commit 623386f13c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,6 +43,10 @@ module Vagrant
# Determine the handler we'll use if we have any port collisions # Determine the handler we'll use if we have any port collisions
repair = !!env[:port_collision_repair] repair = !!env[:port_collision_repair]
# The method we'll use to check if a port is open.
port_checker = env[:port_collision_port_check]
port_checker ||= lambda { |port| is_port_open?("127.0.0.1", port) }
# Log out some of our parameters # Log out some of our parameters
@logger.debug("Extra in use: #{extra_in_use.inspect}") @logger.debug("Extra in use: #{extra_in_use.inspect}")
@logger.debug("Remap: #{remap.inspect}") @logger.debug("Remap: #{remap.inspect}")
@ -69,7 +73,7 @@ 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) || is_port_open?("127.0.0.1", host_port) if extra_in_use.include?(host_port) || port_checker[host_port]
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,
@ -85,7 +89,7 @@ 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) || is_port_open?("127.0.0.1", repaired_port) if extra_in_use.include?(repaired_port) || port_checker[repaired_port]
@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