Commit 74e3e490 authored by szh's avatar szh

update

parent 1ed582b8
...@@ -134,7 +134,13 @@ func backup() error { ...@@ -134,7 +134,13 @@ func backup() error {
BityuanFlag.Flag = false BityuanFlag.Flag = false
return errors.New("bty is running") return errors.New("bty is running")
} }
return SafeBackup() err = SafeBackup()
if err != nil {
return err
}
BityuanFlag.Flag = false
StartProcess(setting.Chain33Pai.Auto)
return nil
} }
func SafeBackup() error { func SafeBackup() error {
...@@ -145,7 +151,6 @@ func SafeBackup() error { ...@@ -145,7 +151,6 @@ func SafeBackup() error {
tlog.Error("SafeBackup","err",buf.String()) tlog.Error("SafeBackup","err",buf.String())
return err return err
} }
BityuanFlag.Flag = false
return nil return nil
} }
...@@ -156,6 +161,14 @@ func recoverNode() error { ...@@ -156,6 +161,14 @@ func recoverNode() error {
tlog.Error("btyPath empty","err","node not exists") tlog.Error("btyPath empty","err","node not exists")
return errors.New("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")
}
backupPath := btyPath + "/datadir_backup" backupPath := btyPath + "/datadir_backup"
if _,err := os.Stat(backupPath);err != nil { if _,err := os.Stat(backupPath);err != nil {
if os.IsNotExist(err) { if os.IsNotExist(err) {
...@@ -164,7 +177,7 @@ func recoverNode() error { ...@@ -164,7 +177,7 @@ func recoverNode() error {
} }
} }
remove := exec.Command("rm","-rf",btyPath+"/datadir") remove := exec.Command("rm","-rf",btyPath+"/datadir")
err := remove.Run() err = remove.Run()
if err != nil { if err != nil {
tlog.Error("rm -rf datadir","err",err) tlog.Error("rm -rf datadir","err",err)
return err return err
...@@ -176,6 +189,7 @@ func recoverNode() error { ...@@ -176,6 +189,7 @@ func recoverNode() error {
tlog.Error("cp -r datadir_backup datadir","err",err) tlog.Error("cp -r datadir_backup datadir","err",err)
return err return err
} }
StartProcess(setting.Chain33Pai.Auto)
return nil return nil
} }
......
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