重置节点 重置钱包 改为消息发送 接口即时返回成功

pkg/app/raspberryChan.go

@@ -9,6 +9,7 @@ import (
 	"os"
 	"os/exec"
 	"time"
+	"path"
 )
 
 var (
@@ -30,37 +31,51 @@ func RaspberryChan() {
 			case "ROLLBACK":
 				err := rollback()
 				if err == nil {
-					tlog.Info("rollback success", "err", nil)
+					tlog.Info("RaspberryChan rollback success", "err", nil)
 				} else {
-					tlog.Error("rollback fail ", "err", err)
+					tlog.Error("RaspberryChan rollback fail ", "err", err)
 				}
 			case "BACKUP":
 				err := backup()
 				if err == nil {
-					tlog.Info("backup success", "err", nil)
+					tlog.Info("RaspberryChan backup success", "err", nil)
 				} else {
-					tlog.Error("backup fail ", "err", err)
+					tlog.Error("RaspberryChan backup fail ", "err", err)
 				}
 			case "RECOVER":
 				err := recoverNode()
 				if err == nil {
-					tlog.Info("recover success", "err", nil)
+					tlog.Info("RaspberryChan recover success", "err", nil)
 				} else {
-					tlog.Error("recover fail ", "err", err)
+					tlog.Error("RaspberryChan recover fail ", "err", err)
 				}
 			case "DELETEBACKUP":
 				err := deleteBackup()
 				if err == nil {
-					tlog.Info("deleteBackup success", "err", nil)
+					tlog.Info("RaspberryChan deleteBackup success", "err", nil)
 				} else {
-					tlog.Error("deleteBackup fail ", "err", err)
+					tlog.Error("RaspberryChan deleteBackup fail ", "err", err)
 				}
 			case "RESTART":
 				err := restartNode()
 				if err == nil {
-					tlog.Info("deleteBackup success", "err", nil)
+					tlog.Info("RaspberryChan deleteBackup success", "err", nil)
 				} else {
-					tlog.Error("deleteBackup fail ", "err", err)
+					tlog.Error("RaspberryChan deleteBackup fail ", "err", err)
+				}
+			case "RESET":
+				err := resetNode()
+				if err == nil {
+					tlog.Info("RaspberryChan resetNode success", "err", nil)
+				} else {
+					tlog.Error("RaspberryChan resetNode fail ", "err", err)
+				}
+			case "RESETWALLET":
+				err := resetWallet()
+				if err == nil {
+					tlog.Info("RaspberryChan resetWallet success", "err", nil)
+				} else {
+					tlog.Error("RaspberryChan resetWallet fail ", "err", err)
 				}
 			}
 
@@ -248,6 +263,52 @@ func restartNode() error {
 	return nil
 }
 
+func resetNode() error {
+	BityuanFlag.Lock.Lock()
+	defer BityuanFlag.Lock.Unlock()
+	if btyPath == "" {
+		tlog.Error("btyPath empty", "err", "node not exists")
+		return errors.New("node not exists")
+	}
+	_, err := SafeCloseNode()
+	if err != nil {
+		return err
+	}
+	isrun := MakeSureBtyIsNotRun()
+	if isrun {
+		return errors.New("bty is running")
+	}
+	err = os.RemoveAll(fmt.Sprintf("%s/datadir", path.Dir(btyPath)))
+	if err != nil {
+		return err
+	}
+	StartProcess(setting.Chain33Pai.Auto)
+	return nil
+}
+
+func resetWallet() error {
+	BityuanFlag.Lock.Lock()
+	defer BityuanFlag.Lock.Unlock()
+	if btyPath == "" {
+		tlog.Error("btyPath empty", "err", "node not exists")
+		return errors.New("node not exists")
+	}
+	_, err := SafeCloseNode()
+	if err != nil {
+		return err
+	}
+	isrun := MakeSureBtyIsNotRun()
+	if isrun {
+		return errors.New("bty is running")
+	}
+	err = os.RemoveAll(fmt.Sprintf("%s/wallet", path.Dir(btyPath)))
+	if err != nil {
+		return err
+	}
+	StartProcess(setting.Chain33Pai.Auto)
+	return nil
+}
+
 func MakeSureBtyIsNotRun() bool {
 	s := time.Now()
 	defer func() {

routers/api/v1/node.go

@@ -16,7 +16,6 @@ import (
 	"net/http"
 	"os"
 	"os/exec"
-	"path"
 	"reflect"
 	"strconv"
 	"strings"
@@ -25,42 +24,8 @@ import (
 
 func ResetWallet(c *gin.Context) {
 	appG := app.Gin{C: c}
-	app.BityuanFlag.Lock.Lock()
-	defer app.BityuanFlag.Lock.Unlock()
-	if app.BityuanFlag.Flag {
-		appG.Response(http.StatusOK, e.TRY_LATER, "other job is busy,please try later")
-		return
-	}
-	app.BityuanFlag.Flag = true
-	if app.NodeError != nil {
-		tlog.Error(app.NodeError.Error())
-		appG.Response(http.StatusOK, e.NODE_ERROR, "node internal error,could not start node")
-		app.BityuanFlag.Flag = false
-		return
-	}
-	t, err := app.SafeCloseNode()
-	if err != nil || !t {
-		app.BityuanFlag.Flag = false
-		appG.Response(http.StatusOK, e.NODE_ERROR, err)
-		return
-	}
-	err = os.RemoveAll(fmt.Sprintf("%s/wallet", path.Dir(app.Bityuan.Path)))
-	if err != nil {
-		appG.Response(http.StatusOK, e.NODE_ERROR, "fail to remove wallet")
-		tlog.Error("ResetWallet", "remove error", err)
-		app.BityuanFlag.Flag = false
-		return
-	}
-
-	err = app.StartProcess(setting.Chain33Pai.Auto)
-	if err != nil {
-		appG.Response(http.StatusOK, e.NODE_ERROR, "fail to restart node")
-		tlog.Error("ResetWallet", "auto.sh error ", err)
-		app.BityuanFlag.Flag = false
-		return
-	}
-	appG.Response(http.StatusOK, e.SUCCESS, "reset complete")
-	app.BityuanFlag.Flag = false
+	app.JobChan <- app.MsgType{Name: "RESETWALLET"}
+	appG.Response(http.StatusOK, e.SUCCESS, "bityuan wallet reset")
 }
 
 //钱包更新，只替换执行文件和配置文件
@@ -189,36 +154,8 @@ func UpdateNodeNew(c *gin.Context) {
 //重置节点只需要删除datadir 然后重启节点
 func ResetNode(c *gin.Context) {
 	appG := app.Gin{C: c}
-	app.BityuanFlag.Lock.Lock()
-	defer app.BityuanFlag.Lock.Unlock()
-	if app.BityuanFlag.Flag {
-		appG.Response(http.StatusOK, e.TRY_LATER, "other job is busy,please try later")
-		return
-	}
-	app.BityuanFlag.Flag = true
-	_, err := app.SafeCloseNode()
-	if err != nil {
-		appG.Response(http.StatusOK, e.NODE_ERROR, "node err")
-		app.BityuanFlag.Flag = false
-		return
-	}
-	err = os.RemoveAll(fmt.Sprintf("%s/datadir", path.Dir(app.Bityuan.Path)))
-	if err != nil {
-		app.BityuanFlag.Flag = false
-		tlog.Error("ResetNode", "remove datadir err", err)
-		appG.Response(http.StatusOK, e.RM_ERROR, "remove datadir err")
-		return
-	}
-	err = app.StartProcess(setting.Chain33Pai.Auto)
-
-	if err != nil {
-		tlog.Error("ResetNode", "start node err", err)
-		app.BityuanFlag.Flag = false
-		appG.Response(http.StatusOK, e.NODE_ERROR, "start auto sh err")
-		return
-	}
-	app.BityuanFlag.Flag = false
-	appG.Response(http.StatusOK, e.SUCCESS, "reset job ok")
+	app.JobChan <- app.MsgType{Name: "RESET"}
+	appG.Response(http.StatusOK, e.SUCCESS, "bityuan reset")
 }
 
 func UpdateDetail(c *gin.Context) {