From 93c06d04644135bd5675589ada29af63dd7c8110 Mon Sep 17 00:00:00 2001
From: yaziming <yaziminga@163.com>
Date: Wed, 27 May 2020 19:04:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=8A=82=E7=82=B9=E4=B8=8D?=
 =?UTF-8?q?=E5=AD=98=E5=9C=A8=E6=97=B6=EF=BC=8C=E6=97=A0=E6=B3=95=E4=B8=BB?=
 =?UTF-8?q?=E5=8A=A8=E5=88=9B=E5=BB=BAmaster=E8=8A=82=E7=82=B9=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/main.go                           | 7 +------
 backend/services/local_node/local_node.go | 7 +++++++
 backend/services/node.go                  | 4 ----
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/backend/main.go b/backend/main.go
index 4a801b44..19846a03 100644
--- a/backend/main.go
+++ b/backend/main.go
@@ -81,12 +81,7 @@ func main() {
 	log.Info("initialized local node successfully")
 
 	if model.IsMaster() {
-		// 初始化Master节点信息
-		if err := services.InitMasterNodeInfo(); err != nil {
-			log.Error("init master node info error:" + err.Error())
-			debug.PrintStack()
-			panic(err)
-		}
+
 		// 初始化定时任务
 		if err := services.InitScheduler(); err != nil {
 			log.Error("init scheduler error:" + err.Error())
diff --git a/backend/services/local_node/local_node.go b/backend/services/local_node/local_node.go
index 109f6534..9b1e1229 100644
--- a/backend/services/local_node/local_node.go
+++ b/backend/services/local_node/local_node.go
@@ -21,5 +21,12 @@ func InitLocalNodeInfo() (err error) {
 	if err != nil {
 		return err
 	}
+	if model.IsMaster() {
+		err = model.UpdateMasterNodeInfo(localNode.Identify, localNode.Ip, localNode.Mac, localNode.Hostname)
+
+		if err != nil {
+			return err
+		}
+	}
 	return localNode.Ready()
 }
diff --git a/backend/services/node.go b/backend/services/node.go
index 2b094e98..0cfcebb2 100644
--- a/backend/services/node.go
+++ b/backend/services/node.go
@@ -284,7 +284,3 @@ func InitNodeService() error {
 	c.Start()
 	return nil
 }
-func InitMasterNodeInfo() (err error) {
-	localNode := local_node.GetLocalNode()
-	return model.UpdateMasterNodeInfo(localNode.Identify, localNode.Ip, localNode.Mac, localNode.Hostname)
-}