matthew/packer-plugin-xenserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Close SSH connections once we're done with them

Browse Source 
Fixes "Waiting for SSH" hang at end of install
This commit is contained in:
Cheng Sun 2014-12-09 17:44:21 +00:00
parent 1450fd0568
commit 97df6fd283
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
builder/xenserver/ssh.go
View File

@ -94,14 +94,19 @@ func forward(local_conn net.Conn, config *gossh.ClientConfig, server, remote_des
ssh_conn, err := ssh_client_conn.Dial("tcp", remote_loc) ssh_conn, err := ssh_client_conn.Dial("tcp", remote_loc)
if err != nil { if err != nil {
log.Printf("ssh.Dial error: %s", err) log.Printf("ssh.Dial error: %s", err)
ssh_client_conn.Close()
return err return err
} }
txDone := make(chan struct{})
rxDone := make(chan struct{})
go func() { go func() {
_, err = io.Copy(ssh_conn, local_conn) _, err = io.Copy(ssh_conn, local_conn)
if err != nil { if err != nil {
log.Printf("io.copy failed: %v", err) log.Printf("io.copy failed: %v", err)
} }
close(txDone)
}() }()
go func() { go func() {
@ -109,6 +114,14 @@ func forward(local_conn net.Conn, config *gossh.ClientConfig, server, remote_des
if err != nil { if err != nil {
log.Printf("io.copy failed: %v", err) log.Printf("io.copy failed: %v", err)
} }
close(rxDone)
}()
go func() {
<-txDone
<-rxDone
ssh_client_conn.Close()
ssh_conn.Close()
}() }()
return nil return nil