mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #26439 from lixiaobing10051267/masterReload
fix logruns.Warnf while daemon.networkOptions fails
This commit is contained in:
commit
eb0728a993
1 changed files with 1 additions and 1 deletions
2
daemon/daemon.go
Normal file → Executable file
2
daemon/daemon.go
Normal file → Executable 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...)
|
||||
|
|
Loading…
Reference in a new issue