Commit 90f72a44 authored by szh's avatar szh

update

parent 76b3f36a
...@@ -152,6 +152,7 @@ func BityuanJob(ticker *time.Ticker) { ...@@ -152,6 +152,7 @@ func BityuanJob(ticker *time.Ticker) {
status, err := GetWalletStatus() status, err := GetWalletStatus()
if err != nil { if err != nil {
tlog.Error("GetWalletStatus", "err", err) tlog.Error("GetWalletStatus", "err", err)
//return
} else if status != nil && status.IsHasSeed { } else if status != nil && status.IsHasSeed {
if status.IsTicketLock && status.IsWalletLock { if status.IsTicketLock && status.IsWalletLock {
err := Unlock() err := Unlock()
...@@ -183,7 +184,7 @@ func BityuanJob(ticker *time.Ticker) { ...@@ -183,7 +184,7 @@ func BityuanJob(ticker *time.Ticker) {
func MakeSureNodeRunning() error { func MakeSureNodeRunning() error {
var pai pai_service.Pai var pai pai_service.Pai
err := pai.SetPai() err := pai.SetPai()
if err != nil { if err == nil && pai.Err != "" {
tlog.Error("MakeSureNodeRunning SetPai", "err", err) tlog.Error("MakeSureNodeRunning SetPai", "err", err)
//判断未启动时 检查配置文件是否正常 //判断未启动时 检查配置文件是否正常
if strings.Contains(err.Error(), "8802") { if strings.Contains(err.Error(), "8802") {
...@@ -219,7 +220,7 @@ func MakeSureNodeRunning() error { ...@@ -219,7 +220,7 @@ func MakeSureNodeRunning() error {
} }
//由于6.5.3小版本太多 矿机用户升级临时用了很多小版本,针对6.5.3这些版本节点 进行强制升级到1.65.2-8f91c0b5 //由于6.5.3小版本太多 矿机用户升级临时用了很多小版本,针对6.5.3这些版本节点 进行强制升级到1.65.2-8f91c0b5
//arm版本未写入git小版本号 故从执行文件sha256判断是否时最新版本 //arm版本未写入git小版本号 故从执行文件sha256判断是否时最新版本
if pai.BtyVersion.App == "6.5.3" { if pai.BtyVersion != nil && pai.BtyVersion.App == "6.5.3" {
util.AddValue(&JobID, 1) util.AddValue(&JobID, 1)
JobChan <- MsgType{Name: "FORCEUPDATETO653", JobID: JobID} JobChan <- MsgType{Name: "FORCEUPDATETO653", JobID: JobID}
tlog.Info("MakeSureNodeRunning ", "checkout", "wheather node is newest in chain33 1.65.2") tlog.Info("MakeSureNodeRunning ", "checkout", "wheather node is newest in chain33 1.65.2")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment