update

pkg/app/broadcast.go

@@ -71,7 +71,6 @@ func Broadcast() {
 				panic(err)
 			}
 			tlog.Info("broadcast", "oldip", runningAddr.IP.String(), "newip", ip.IP.String())
-
 		}
 
 		runningAddr = ip
@@ -83,7 +82,6 @@ func Broadcast() {
 		}
 		tlog.Info("broadcast", "ip:", ip.IP.String(), "udp", send)
 		time.Sleep(time.Second * 1)
-
 	}
 
 }

pkg/app/process.go

@@ -56,8 +56,6 @@ type BityuanOp struct {
 	Lock sync.Mutex
 }
 
-var paiJobs pai_service.Pai
-
 var BityuanFlag BityuanOp //true表示有任务在占用，禁止其他重复操作
 var Bityuan ProcessInfo
 var UpdateInfo updateInfo
@@ -90,7 +88,6 @@ func getProcessInfo(keyfile string) string {
 }
 
 func getWalletInfo() error {
-
 	rawProcessInfo := getProcessInfo(setting.BityuanSetting.Name)
 	tlog.Info("getWalletInfo", "wallet", rawProcessInfo)
 	if rawProcessInfo == "" {
@@ -148,7 +145,6 @@ func BityuanJob(ticker *time.Ticker) {
 				NodeError = getWalletInfo()
 				//解锁钱包
 				if NodeError == nil {
-
 					status, err := GetWalletStatus()
 					if err != nil {
 						tlog.Error("GetWalletStatus", "err", err)
@@ -166,7 +162,6 @@ func BityuanJob(ticker *time.Ticker) {
 						//	}
 						//}
 					}
-
 				}
 				//升级6.4.0bityuan
 				//updateBityuan640()
@@ -535,16 +530,16 @@ func AutoUpdate() {
 				tlog.Info("kill restart pai success ")
 			}
 		}
-	} else {
-		if !DPercent.Flag { //没有其他任务占用
-			DPercent.Flag = true
-			err := AutoUpdatePai()
-			if err != nil {
-				tlog.Error("autoupdatepai", "err", err)
-			}
-			tlog.Info("autoupdatepai", "err", GetVersion())
-			DPercent.Flag = false
+	} else if !DPercent.Flag {
+		//没有其他任务占用
+		DPercent.Flag = true
+		err := AutoUpdatePai()
+		if err != nil {
+			tlog.Error("autoupdatepai", "err", err)
 		}
+		tlog.Info("autoupdatepai", "err", GetVersion())
+		DPercent.Flag = false
+
 	}
 }
 

pkg/app/request.go

@@ -11,6 +11,4 @@ func MarkErrors(errors []*validation.Error) {
 	for _, err := range errors {
 		logging.Info(err.Key, err.Message)
 	}
-
-	return
 }

pkg/app/response.go

@@ -23,5 +23,4 @@ func (g *Gin) Response(httpCode, errCode int, data interface{}) {
 		Msg:  e.GetMsg(errCode),
 		Data: data,
 	})
-	return
 }

pkg/cmd/cmd.go

@@ -5,19 +5,25 @@ import (
 	"bytes"
 	"strings"
 	"fmt"
+	"github.com/33cn/chain33/common/log"
 )
 
+var cmdLog = log.New("pkg", "app")
+
 func GetLocalArchType() string {
 	cmd := exec.Command("arch")
 	var buf bytes.Buffer
 	cmd.Stdout = &buf
-	cmd.Run()
+	err := cmd.Run()
+	if err != nil {
+		cmdLog.Error("GetLocalArchType","err",err)
+		return ""
+	}
 	if buf.String() != "" {
 		lines := strings.Split(buf.String(),"\n")
 		if len(lines) == 2 {
 			return strings.Trim(lines[0]," ")
 		}
-		return ""
 	}
 	return ""
 }

pkg/pai/pai.go

@@ -56,8 +56,16 @@ func FindAbsPath(name string) string {
 	var buffer bytes.Buffer
 	cmd := exec.Command("find", "/media", "-name", name)
 	cmd.Stdout = &buffer
-	cmd.Start()
-	cmd.Wait()
+	err := cmd.Start()
+	if err != nil {
+		tlog.Error("FindAbsPath start", "ERR", err)
+		return ""
+	}
+	err = cmd.Wait()
+	if err != nil {
+		tlog.Error("FindAbsPath wait", "ERR", err)
+		return ""
+	}
 	if buffer.String() == "" {
 		tlog.Error("FindAbsPath", "ERR", "node path not exists")
 		return ""

routers/api/v1/node.go

@@ -23,8 +23,6 @@ import (
 	"time"
 )
 
-var flag bool //判断是否正在更新
-
 func ResetWallet(c *gin.Context) {
 	appG := app.Gin{C: c}
 	app.BityuanFlag.Lock.Lock()
@@ -86,7 +84,7 @@ func UpdateNodeNew(c *gin.Context) {
 		appG.Response(http.StatusOK, e.ERROR, "get pwd err")
 		return
 	}
-	pwd = pwd + "/"
+	pwd += "/"
 	app.BityuanFlag.Flag = true
 	//app.UpdateInfo.Flag = false
 	setting.FreshVersion()
@@ -495,12 +493,12 @@ func EscrowPasswd(c *gin.Context) {
 		return
 	}
 	f, err := os.OpenFile(setting.BityuanSetting.Passwd, os.O_WRONLY|os.O_TRUNC|os.O_CREATE, 0666)
-	defer f.Close()
 	if err != nil {
 		appG.Response(http.StatusOK, e.ENV_ERROR, nil)
 		tlog.Info(err.Error())
 		return
 	}
+	defer f.Close()
 	f.WriteString(passwd.Password)
 	appG.Response(http.StatusOK, e.SUCCESS, nil)
 

service/pai_service/pai.go

@@ -159,7 +159,7 @@ func (p *Pai) GetDevstatus() error {
 func getPaiConfig(command string, arg ...string) (config map[string]string, err error) {
 	//获取操作系统版本信息
 
-	list := make(map[string]string, 0)
+	list := make(map[string]string)
 	cmd := exec.Command("cat", arg...)
 	stdout, err := cmd.StdoutPipe()
 	//tlog.Info(stdout)
@@ -204,12 +204,14 @@ func (p *Pai) GetPaiLatestVersion(t int32) (string, error) {
 	bytesData, _ := json.Marshal(data)
 	resp, err := http.Post(setting.Chain33Pai.VersionUrl, "application/json", bytes.NewReader(bytesData))
 	if err != nil {
+		resp.Close()
 		return "", err
 	}
 	body, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
 		return "", err
 	}
+
 	type res struct {
 		Code int64
 		Msg  string