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

communicators/ssh: properly allow errors through while waiting

This commit is contained in:
Mitchell Hashimoto 2014-02-13 21:04:41 -08:00
parent ed5e544e63
commit 2fe2fe79ed
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/communicators/ssh/communicator.rb
View File

@ -53,6 +53,7 @@ module VagrantPlugins
@machine.ui.detail("SSH auth method: #{ssh_auth_type}") @machine.ui.detail("SSH auth method: #{ssh_auth_type}")
while true while true
message = nil
begin begin
begin begin
connect(retries: 1) connect(retries: 1)
@ -75,9 +76,13 @@ module VagrantPlugins
message = "Host appears down." message = "Host appears down."
rescue Errno::EHOSTUNREACH rescue Errno::EHOSTUNREACH
message = "Host unreachable." message = "Host unreachable."
rescue Vagrant::Errors::VagrantError => e
# Ignore it, SSH is not ready, some other error.
end end
@machine.ui.detail("Error: #{message} Retrying...") if message
@machine.ui.detail("Error: #{message} Retrying...")
end
end end
end end
rescue Timeout::Error rescue Timeout::Error