浏览代码

Merge pull request #1725 from aboch/ags

agentSetup to first check if clusterProvider is nil
Santhosh Manohar 8 年之前
父节点
当前提交
cf355d1689
共有 1 个文件被更改,包括 7 次插入0 次删除
  1. 7 0
      libnetwork/agent.go

+ 7 - 0
libnetwork/agent.go

@@ -187,6 +187,13 @@ func (c *controller) agentSetup() error {
 	clusterProvider := c.cfg.Daemon.ClusterProvider
 	agent := c.agent
 	c.Unlock()
+
+	if clusterProvider == nil {
+		msg := "Aborting initialization of Libnetwork Agent because cluster provider is now unset"
+		logrus.Errorf(msg)
+		return fmt.Errorf(msg)
+	}
+
 	bindAddr := clusterProvider.GetLocalAddress()
 	advAddr := clusterProvider.GetAdvertiseAddress()
 	remote := clusterProvider.GetRemoteAddress()