kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Remove goroutine leak upon error

Browse source 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
This commit is contained in:
Guillaume J. Charmes 2014-03-11 11:39:28 -07:00
parent 0a6d9035cf
commit 721562f296
No known key found for this signature in database
GPG key ID: B33E4642CB6E3FF3
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
execdriver/lxc/driver.go
View file

@ -168,6 +168,9 @@ func (d *driver) Run(c *execdriver.Command, pipes *execdriver.Pipes, startCallba
// Poll lxc for RUNNING status // Poll lxc for RUNNING status
pid, err := d.waitForStart(c, waitLock) pid, err := d.waitForStart(c, waitLock)
if err != nil { if err != nil {
if c.Process != nil {
c.Process.Kill()
}
return -1, err return -1, err
} }
c.ContainerPid = pid c.ContainerPid = pid

6
server.go
View file

@ -2384,7 +2384,13 @@ func (srv *Server) IsRunning() bool {
} }
func (srv *Server) Close() error { func (srv *Server) Close() error {
if srv == nil {
return nil
}
srv.SetRunning(false) srv.SetRunning(false)
if srv.runtime == nil {
return nil
}
return srv.runtime.Close() return srv.runtime.Close()
} }