github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-02 17:50:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2894 from weaveworks/2017-10-16-close-pipe-error-path

Browse Source 
docker: Close pipe when the docker API call fails
This commit is contained in:
Damien Lespiau
2017-10-18 12:10:45 +01:00
committed by GitHub
parent d1eb9862a1 5990ad4947
commit 17428fc59e
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
probe/docker/controls.go
View File

@@ -86,6 +86,7 @@ func (r *registry) attachContainer(containerID string, req xfer.Request) xfer.Re
ErrorStream: local,
})
if err != nil {
pipe.Close()
return xfer.ResponseError(err)
}
pipe.OnClose(func() {
@@ -133,6 +134,7 @@ func (r *registry) execContainer(containerID string, req xfer.Request) xfer.Resp
ErrorStream: local,
})
if err != nil {
pipe.Close()
return xfer.ResponseError(err)
}