From 4cda874e24e56e0310e7bf946bc1fc97b91784d4 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期四, 22 十月 2020 16:32:21 +0800
Subject: [PATCH] fic

---
 ClusterApi.go |   38 +++++++++++++++++++++++++++-----------
 1 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/ClusterApi.go b/ClusterApi.go
index 116166a..269e662 100644
--- a/ClusterApi.go
+++ b/ClusterApi.go
@@ -30,26 +30,28 @@
 }
 
 //鍚姩鏈嶅姟
-func StartServer(binPath string, ip string) bool {
-	resultMsg := CMDSC("sh " + binPath + "/elasticsearch -d")
+func StartServer(binPath string, ip string, port string) bool {
+	resultMsg := CMDSC("sh " + binPath + "/es_start.sh")
 	if resultMsg == "杩愯澶辫触" {
 		return false
 	}
-	bool := VerifyNodeServer(ip, "9200")
-	return bool
+	b := VerifyNodeServer(ip, port)
+	return b
 }
 
 //鍏抽棴鏈嶅姟
-func StopServer(pidPath string, ip string, port string) bool {
-	bool := VerifyShortNodeServer(ip, port)
-	if bool == true {
-		resultMsg := CMDSC("kill `cat " + pidPath + "pid`")
+func StopServer(binPath string, ip string, port string) bool {
+	b := VerifyShortNodeServer(ip, port)
+	if b == true {
+		resultMsg := CMDSC("sh " + binPath + "/es_stop.sh")
 		if resultMsg == "杩愯澶辫触" {
-			return false
+			return true
 		}
 	}
-	return true
+	bs := VerifyShortNodeServer(ip, port)
+	return bs
 }
+
 
 //鏇存崲鑺傜偣瑙掕壊
 func UpdateNodeRole(configPath string, role string) (bool, error) {
@@ -142,6 +144,21 @@
 	return role, nil
 }
 
+//鏌ヨ缁勬挱鍒楄〃
+func GetDiscoveryZenPingUnicastHosts(configPath string) ([]string, error) {
+	v := viper.New()
+	v.SetConfigType("yml")
+	v.SetConfigName("elasticsearch")
+	v.AddConfigPath(configPath)
+	err := v.ReadInConfig()
+	if err != nil {
+		return nil, err
+	}
+	hosts := v.GetStringSlice("discovery.zen.ping.unicast.hosts")
+	return hosts, nil
+}
+
+//璁剧疆缁勬挱鍒楄〃
 func SetDiscoveryZenPingUnicastHosts(configPath string, hosts []string) (bool, error) {
 	v := viper.New()
 	v.SetConfigType("yml")
@@ -284,7 +301,6 @@
 	}
 	request, err := http.NewRequest(method, url, bytes.NewBuffer(parama))
 	request.Header.Set("Content-type", "application/json")
-
 	if err != nil {
 		fmt.Println("build request fail !")
 		return nil, err

--
Gitblit v1.8.0