From 8b1df882c1e437d20ba7f2641310f56928c6eb68 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期四, 07 十一月 2019 19:54:22 +0800
Subject: [PATCH] fix updateEsHosts

---
 controllers/es.go |   27 +++++++++++++++++++++++----
 1 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/controllers/es.go b/controllers/es.go
index bdc4d3a..5587110 100644
--- a/controllers/es.go
+++ b/controllers/es.go
@@ -395,12 +395,14 @@
 // @Failure 500 {string} json "{"code":500, msg:"", success:false}"
 // @Router /data/api-v/es/updateEsHosts [POST]
 func (em *EsManagementController) UpdateEsHosts(c *gin.Context) {
+	flag := "淇敼鎴愬姛"
 	var hosts Hosts
 	c.BindJSON(&hosts)
 	nodeInfos, err := getEsClusterInfors(hosts.OldIp)
 	var nodeType string
 	if err != nil {
 		logger.Fatal(err)
+		util.ResponseFormat(c, code.QueryClusterInfoErr, err)
 	}
 	newMasterHosts := make([]string, 0)
 	allHosts := make([]string, 0)
@@ -420,7 +422,10 @@
 
 	if nodeType == "master" {
 		str1 := "sed -ie 's/network.host: " + hosts.OldIp + "/network.host: " + hosts.NewIp + "/g' /opt/elasticsearch/config/elasticsearch.yml"
-		runScript(str1)
+		msg1 := runScript(str1)
+		if msg1 == "杩愯澶辫触" {
+			flag = "淇敼閰嶇疆鏂囦欢澶辫触"
+		}
 		for i, host := range newMasterHosts {
 			if host == hosts.OldIp {
 				newMasterHosts[i] = hosts.NewIp
@@ -439,15 +444,29 @@
 		outs := strings.Replace(ots, "\"", "\\\"", -1)
 		oldUnicastHost := "\\" + strings.Replace(outs, "]", "\\]", -1)
 		str2 := "sed -ie 's/discovery.zen.ping.unicast.hosts: " + oldUnicastHost + "/discovery.zen.ping.unicast.hosts: " + newUnicastHost + "/g' /opt/elasticsearch/config/elasticsearch.yml"
-		runScript(str2)
+		msg2 := runScript(str2)
+		if msg2 == "杩愯澶辫触" {
+			flag = "淇敼閰嶇疆鏂囦欢澶辫触"
+		}
 		for _, host := range allHosts {
 			str3 := "sshpass -p \"123\" ssh basic@" + host + " \"cd /opt/elasticsearch/config  ; " + str2 + " ; cat elasticsearch.yml\""
-			runScript(str3)
+			msg := runScript(str3)
+			if msg == "杩愯澶辫触" {
+				flag = "淇敼閰嶇疆鏂囦欢澶辫触"
+			}
 		}
 	} else {
 		str1 := "sed -ie 's/network.host: " + hosts.OldIp + "/network.host: " + hosts.NewIp + "/g' /opt/elasticsearch/config/elasticsearch.yml"
-		runScript(str1)
+		msg1 := runScript(str1)
+		if msg1 == "杩愯澶辫触" {
+			flag = "淇敼閰嶇疆鏂囦欢澶辫触"
+		}
 	}
+	if flag == "淇敼閰嶇疆鏂囦欢澶辫触" {
+		util.ResponseFormat(c, code.UpdateFail, flag)
+	}
+	util.ResponseFormat(c, code.Success, flag)
+
 }
 
 type Hosts struct {

--
Gitblit v1.8.0