From f7b91b25f1f853fcc1aa5480dcccb81b5715d8cf Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期一, 13 四月 2020 10:15:43 +0800
Subject: [PATCH] fix asVolume

---
 controllers/swfsControllers.go |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/controllers/swfsControllers.go b/controllers/swfsControllers.go
index 1465b6a..e09612a 100644
--- a/controllers/swfsControllers.go
+++ b/controllers/swfsControllers.go
@@ -47,13 +47,13 @@
 	var body SWFSInfo
 	c.BindJSON(&body)
 	role := body.Role
-	nowPeers := GetNowPeersList()
 	if role == "master" {
-		AsMaster(nowPeers)
+		AddNewMasterToPeers()
+		AsMaster()
 		util.ResponseFormat(c, code.AddSuccess, "鍔犲叆鑺傜偣鎴愬姛")
 		return
 	} else if role == "volume" {
-		AsVolume(nowPeers)
+		AsVolume()
 		util.ResponseFormat(c, code.AddSuccess, "鍔犲叆鑺傜偣鎴愬姛")
 		return
 	} else {
@@ -64,7 +64,7 @@
 }
 
 func (sc *SeaweedfsController) RoleOfVolumeToMasterController(c *gin.Context) {
-	AsMaster(GetNowPeersList())
+	AsMaster()
 }
 
 func (sc *SeaweedfsController) RestartMasterController(c *gin.Context) {
@@ -173,13 +173,14 @@
 }
 
 //浣滀负鏁版嵁鑺傜偣鍔犲叆
-func AsVolume(nowPeers []interface{}) {
+func AsVolume() {
 	ReplaceLineContentBySearch(StartScriptAsVolume, config.Server.ScriptPath, StartServerScript)
+	StartServer(config.Server.ScriptPath)
 }
 
 //浣滀负涓昏妭鐐瑰姞鍏ワ紙榛樿鍖呭惈鏁版嵁鑺傜偣锛�
-func AsMaster(nowPeers []interface{}) {
-	AddNewMasterToPeers()
+func AsMaster() {
+	nowPeers := GetNowPeersList()
 	RequestMasterNodesOperation(nowPeers)
 }
 

--
Gitblit v1.8.0