beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #36651 from keloyang/judgment-daemonWaitCh

Browse source 
Add if judgment before receiving operations on daemonWaitCh
This commit is contained in:
Vincent Demeester 2018-03-28 10:07:57 +02:00 committed by GitHub
commit b6a7d027e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libcontainerd/remote_daemon.go
View file

@ -307,7 +307,9 @@ func (r *remote) monitorConnection(monitor *containerd.Client) {
<-time.After(100 * time.Millisecond)
system.KillProcess(r.daemonPid)
}
<-r.daemonWaitCh
if r.daemonWaitCh != nil {
<-r.daemonWaitCh
}
monitor.Close()
os.Remove(r.GRPC.Address)