docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2090 from nathanleclaire/heartbeat_disconnect 

Stop heartbeat when there is an issue connecting to the server
This commit is contained in:
Olivier Gambier 2015-10-27 11:41:40 -07:00
parent 9fa2f73139 3dd578318a
commit 104ebf58cf
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libmachine/drivers/rpc/client_driver.go
View File

@ -73,19 +73,21 @@ func NewRpcClientDriver(rawDriverData []byte, driverName string) (*RpcClientDriv
heartbeatDoneCh: make(chan bool), heartbeatDoneCh: make(chan bool),
} }
go func(heartbeatDoneCh <-chan bool) { go func(c *RpcClientDriver) {
for { for {
select { select {
case <-heartbeatDoneCh: case <-c.heartbeatDoneCh:
return return
default: default:
if err := c.Client.Call("RpcServerDriver.Heartbeat", struct{}{}, nil); err != nil { if err := c.Client.Call("RpcServerDriver.Heartbeat", struct{}{}, nil); err != nil {
log.Warnf("Error attempting heartbeat call to plugin server: %s", err) log.Warnf("Error attempting heartbeat call to plugin server: %s", err)
c.Close()
return
} }
time.Sleep(heartbeatInterval) time.Sleep(heartbeatInterval)
} }
} }
}(c.heartbeatDoneCh) }(c)
var version int var version int
if err := c.Client.Call("RpcServerDriver.GetVersion", struct{}{}, &version); err != nil { if err := c.Client.Call("RpcServerDriver.GetVersion", struct{}{}, &version); err != nil {