From f4c1ad199cdd31a454a60e50661db0de1747977a Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期五, 17 四月 2020 17:35:26 +0800
Subject: [PATCH] fix last
---
tools/middleware/middleware.go | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/tools/middleware/middleware.go b/tools/middleware/middleware.go
index 18d8ff7..c0c6da8 100644
--- a/tools/middleware/middleware.go
+++ b/tools/middleware/middleware.go
@@ -31,6 +31,7 @@
}
script.ReplaceLineContentBySearch(config.Option+config.StartScriptAsVolume, config.Option, config.Server.ScriptPath, config.StartServerScript)
script.ReplaceLineContentBySearch(es.GetNewPeers(), config.Peer, config.Server.ScriptPath, config.StartServerScript)
+ script.StopServer(config.Server.ScriptPath)
script.StartServer(config.Server.ScriptPath)
return true
}
@@ -113,12 +114,15 @@
case config.StartScriptAsVolume:
verificationVolumeUrl := "http://" + ip + ":6700/ui/index.html"
_, volume1Err := http.Get(verificationVolumeUrl)
+ fmt.Println("volume1Err", volume1Err)
if volume1Err == nil {
resStatu = true
}
case config.StartScriptAsMaster:
verificationMasterUrl := "http://" + ip + ":6333"
+ fmt.Println("verificationMasterUrl: ", verificationMasterUrl)
_, masterErr := http.Get(verificationMasterUrl)
+ fmt.Println("masterErr", masterErr)
if masterErr == nil {
resStatu = true
}
@@ -155,13 +159,13 @@
fmt.Println("閲嶅惎褰撳墠缁勬湇鍔�" + ip)
if (i+1)%coreThread == 0 {
masterIp = append(masterIp, strings.Split(ip, ":")[0])
- fmt.Println("鍔犲叆绗竴缁勫苟寮�濮嬮獙璇佺涓�缁� masterIp: ", masterIp)
+ fmt.Println("楠岃瘉褰撳墠缁� masterIp 鎴愬憳: ", masterIp)
for i := 0; i < len(masterIp); i++ {
fmt.Println("len masterIp: ", len(masterIp))
fmt.Println("绗�" + strconv.Itoa(i) + "涓嚎绋�")
- fmt.Println("褰撳墠goroutinebe")
+ //fmt.Println("褰撳墠goroutinebe")
waitGroup.Add(1) //姣忓垱寤轰竴涓猤oroutine锛屽氨鎶婁换鍔￠槦鍒椾腑浠诲姟鐨勬暟閲�+1
- fmt.Println("褰撳墠goroutineaf")
+ //fmt.Println("褰撳墠goroutineaf")
go Restart(masterIp[i], timeOut)
waitGroup.Done()
}
@@ -184,7 +188,6 @@
break
}
}
-
}
fmt.Println("鏈嶅姟娴佺▼鎵ц瀹屾瘯")
--
Gitblit v1.8.0