From 07658d2c4d1d187ef07e47bac71a2a628f730965 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期四, 16 四月 2020 15:17:11 +0800
Subject: [PATCH] fix verification roleError
---
controllers/swfsControllers.go | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/controllers/swfsControllers.go b/controllers/swfsControllers.go
index 98f2f49..450234c 100644
--- a/controllers/swfsControllers.go
+++ b/controllers/swfsControllers.go
@@ -91,8 +91,8 @@
func (sc *SeaweedfsController) RestartServerController(c *gin.Context) {
StopServer(config.Server.ScriptPath)
- time.Sleep(time.Second * 1)
StartServer(config.Server.ScriptPath)
+ time.Sleep(time.Second * 1)
//fmt.Println("GetLocalStartupItem: ", GetLocalStartupItem(config.Server.ScriptPath, StartServerScript))
result := strings.Split(GetLocalStartupItem(config.Server.ScriptPath, StartServerScript), "=")[1]
fmt.Println("result: ", result)
@@ -101,12 +101,14 @@
//鍚姩鏈嶅姟
func StartServer(scriptPath string) {
- util.RunScript("sh " + scriptPath + StartServerScript)
+ //fmt.Println("sh " + scriptPath + "/" + StartServerScript)
+ util.RunScript("sh " + scriptPath + "/" + StartServerScript)
}
//鍋滄鏈嶅姟
func StopServer(scriptPath string) {
- util.RunScript("sh " + scriptPath + StopServerScript)
+ //fmt.Println("sh " + scriptPath + "/" + StopServerScript)
+ util.RunScript("sh " + scriptPath + "/" + StopServerScript)
}
//鏍规嵁鎼滅储鍐呭鏇挎崲鏁磋鍐呭
@@ -154,13 +156,13 @@
url := "http://" + ip + ":7020/node/api-v/swfs/restartServer"
var info interface{}
httpRes, _ := http.Get(url)
- defer httpRes.Body.Close()
body, _ := ioutil.ReadAll(httpRes.Body)
json.Unmarshal(body, &info)
res, ok := info.(map[string]interface{})
if !ok {
fmt.Println("http response interface can not change map[string]interface{}")
}
+ fmt.Println("res: ", res)
startupItem := res["data"].(string)
if httpRes.StatusCode == 200 {
startupItem = string(body)
@@ -182,9 +184,10 @@
//楠岃瘉鏈嶅姟鐘舵��
func Verification(startupItem string, ip string) bool {
resStatu := false
+ fmt.Println(startupItem)
switch startupItem {
case StartScriptAsVolume:
- verificationVolumeUrl := "http://" + ip + ":6700"
+ verificationVolumeUrl := "http://" + ip + ":6700/ui/index.html"
_, volume1Err := http.Get(verificationVolumeUrl)
if volume1Err == nil {
resStatu = true
@@ -197,9 +200,11 @@
}
case StartScriptAsMaVo:
verificationMasterUrl := "http://" + ip + ":6333"
- verificationVolumeUrl := "http://" + ip + ":6700"
+ verificationVolumeUrl := "http://" + ip + ":6700/ui/index.html"
_, masterErr := http.Get(verificationMasterUrl)
+ fmt.Println("masterErr", masterErr)
_, volume1Err := http.Get(verificationVolumeUrl)
+ fmt.Println("volume1Err", volume1Err)
if masterErr == nil && volume1Err == nil {
resStatu = true
}
--
Gitblit v1.8.0