kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #26439 from lixiaobing10051267/masterReload 

fix logruns.Warnf while daemon.networkOptions fails
This commit is contained in:
Vincent Demeester 2016-09-13 11:03:52 +02:00 committed by GitHub
parent 0deae9f2fa 56916b5e8d
commit eb0728a993
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
daemon/daemon.go Normal file → Executable file
View File

@ -1055,7 +1055,7 @@ func (daemon *Daemon) reloadClusterDiscovery(config *Config) error {
}
netOptions, err := daemon.networkOptions(daemon.configStore, nil)
if err != nil {
logrus.Warnf("Failed to reload configuration with network controller: %v", err)
logrus.WithError(err).Warnf("failed to get options with network controller")
return nil
}
err = daemon.netController.ReloadConfiguration(netOptions...)