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

Fix the forward port collision handling

This commit is contained in:
Mitchell Hashimoto 2013-02-27 13:40:11 -08:00
parent 1505fc9d22
commit 4254b35b7d
1 changed files with 5 additions and 3 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

@ -48,12 +48,12 @@ module Vagrant
usable_ports.subtract(extra_in_use) usable_ports.subtract(extra_in_use)
# Pass one, remove all defined host ports from usable ports # Pass one, remove all defined host ports from usable ports
with_forwarded_ports do |args| with_forwarded_ports(env) do |args|
usable_ports.delete(args[1]) usable_ports.delete(args[1])
end end
# Pass two, detect/handle any collisions # Pass two, detect/handle any collisions
with_forwarded_ports do |args| with_forwarded_ports(env) do |args|
guest_port = args[0] guest_port = args[0]
host_port = args[1] host_port = args[1]
@ -97,11 +97,13 @@ module Vagrant
:new_port => repaired_port.to_s)) :new_port => repaired_port.to_s))
end end
end end
@app.call(env)
end end
protected protected
def with_forwarded_ports def with_forwarded_ports(env)
env[:machine].config.vm.networks.each do |type, args| env[:machine].config.vm.networks.each do |type, args|
# Ignore anything but forwarded ports # Ignore anything but forwarded ports
next if type != :forwarded_port next if type != :forwarded_port