From 56916b5e8d8a22bc9590d28b9b752a2db4821441 Mon Sep 17 00:00:00 2001
From: lixiaobing10051267
Date: Fri, 9 Sep 2016 17:04:06 +0800
Subject: [PATCH] fix logruns.Warnf while daemon.networkOptions fails
Signed-off-by: lixiaobing10051267
Signed-off-by: lixiaobing10051267
---
daemon/daemon.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
mode change 100644 => 100755 daemon/daemon.go
diff --git a/daemon/daemon.go b/daemon/daemon.go
old mode 100644
new mode 100755
index 52e587eb43..4d70ad0acd
--- a/daemon/daemon.go
+++ b/daemon/daemon.go
@@ -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...)