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

Merge pull request #23473 from coolljt0725/fix_stop_crash

Browse source 
Fix shutdown daemon during daemon staring casue crash
This commit is contained in:
Vincent Demeester 2016-06-13 20:08:12 +02:00 • committed by GitHub
commit d169f057d9
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
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