iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

communicator/ssh: set TCP keep-alive [GH-872]

This commit is contained in:
Mitchell Hashimoto 2014-02-21 14:45:40 -08:00
parent eacac89a24
commit 9d55fa7f46
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -20,6 +20,7 @@ BUG FIXES:
checksum type is "none" checksum type is "none"
* builder/virtualbox,vmware/qemu: Support for additional scancodes for * builder/virtualbox,vmware/qemu: Support for additional scancodes for
`boot_command` such as `<up>`, `<left>`, `<insert>`, etc. [GH-808] `boot_command` such as `<up>`, `<left>`, `<insert>`, etc. [GH-808]
* communicator/ssh: Send TCP keep-alives on connections. [GH-872]
* provisioners/ansible-local: Properly upload custom playbooks. [GH-829] * provisioners/ansible-local: Properly upload custom playbooks. [GH-829]
## 0.5.1 (01/02/2014) ## 0.5.1 (01/02/2014)

9
communicator/ssh/connect.go
View File

@ -10,6 +10,13 @@ import (
// is suitable for use with the SSH communicator configuration. // is suitable for use with the SSH communicator configuration.
func ConnectFunc(network, addr string) func() (net.Conn, error) { func ConnectFunc(network, addr string) func() (net.Conn, error) {
return func() (net.Conn, error) { return func() (net.Conn, error) {
return net.DialTimeout(network, addr, 15*time.Second) c, err := net.DialTimeout(network, addr, 15*time.Second)
if err != nil {
return nil, err
}
if tcpConn, ok := c.(*net.TCPConn); ok {
tcpConn.SetKeepAlive(true)
}
} }
} }