p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #23473 from coolljt0725/fix_stop_crash

Browse Source 
Fix shutdown daemon during daemon staring casue crash
Upstream-commit: d169f057d9007580aa7ddb3ca7fca8de1e481081
Component: engine
This commit is contained in:
Vincent Demeester
2016-06-13 20:08:12 +02:00
committed by GitHub
parent f38c785cc7 5fe11026e0
commit 5751f65265
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
components/engine/cmd/dockerd/daemon.go
View File

@ -127,11 +127,6 @@ func (cli *DaemonCli) start() (err error) {
stopc := make(chan bool)
defer close(stopc)
signal.Trap(func() {
cli.stop()
<-stopc // wait for daemonCli.start() to return
})
// warn from uuid package when running the daemon
uuid.Loggerf = logrus.Warnf
@ -258,6 +253,11 @@ func (cli *DaemonCli) start() (err error) {
if err != nil {
return err
}
cli.api = api
signal.Trap(func() {
cli.stop()
<-stopc // wait for daemonCli.start() to return
})
d, err := daemon.NewDaemon(cli.Config, registryService, containerdRemote)
if err != nil {
@ -276,7 +276,6 @@ func (cli *DaemonCli) start() (err error) {
initRouter(api, d)
cli.d = d
cli.api = api
cli.setupConfigReloadTrap()
// The serve API routine never exits unless an error occurs