From 17bd0564775dd89a9e7f9dafb44624b05866714d Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 20 十二月 2019 18:31:36 +0800
Subject: [PATCH] upgrade use tar.gz
---
service/SysService.go | 74 +++++++++++++++++++++++++++++++------
1 files changed, 62 insertions(+), 12 deletions(-)
diff --git a/service/SysService.go b/service/SysService.go
index c50339f..02f67b5 100644
--- a/service/SysService.go
+++ b/service/SysService.go
@@ -135,6 +135,9 @@
logger.Debug("write chunkData err:",err2,"nn:",nn)
return false
}
+ if err = writer.Flush(); err != nil {
+ logger.Debug("write flush err:",err)
+ }
isComplete := false
dirFiles, _ := ioutil.ReadDir(fileTmpPath)
if dirFiles != nil && len(dirFiles) == arg.TotalChunks {
@@ -152,6 +155,9 @@
//upgrade
func (sv SysService) Upgrade(identifier string,filename string) (bool,error) {
+ if !bakBeforeUpgrade() {
+ return false,errors.New("鏇存柊鍓嶅浠藉け璐�")
+ }
configPatchPath := ""
if config.Server.PatchPath != "" {
configPatchPath = config.Server.PatchPath
@@ -171,7 +177,7 @@
return false,errors.New("鑾峰彇鍗囩骇鍘嬬缉鍖卪d5澶辫触")
}
if strMd5 == identifier {
- if util.ZipCheck(zipFilePath) {
+ if util.TarGzCheck(zipFilePath) {
if !updatePatch(identifier, ext) {
return false,errors.New("鎵ц鍗囩骇杩囩▼寮傚父")
}
@@ -189,6 +195,30 @@
}
}
+func bakBeforeUpgrade() bool {
+ configBakPath := ""
+ if config.Server.BakPath != "" {
+ configBakPath = config.Server.BakPath
+ } else {
+ configBakPath = "/opt/vasystem/bak"
+ }
+ if util.Exists(configBakPath) {
+ //鍙繚鐣欐渶鏂扮殑鐗堟湰
+ if err := os.RemoveAll(configBakPath);err != nil {
+ return false
+ }
+ }
+ if !util.CreateDirectory(configBakPath) {
+ return false
+ }
+ b, err := ExecCmd("cp -r /opt/vasystem/bin /opt/vasystem/bak")
+ if err != nil {
+ logger.Debug("bakBeforeUpgrade result:",string(b),"err:",err)
+ return false
+ }
+ return true
+}
+
//鏇存柊绯荤粺绋嬪簭
func updatePatch(identifier string, ext string) bool {
configPatchPath := ""
@@ -198,33 +228,47 @@
configPatchPath = "/opt/vasystem/patch"
}
//1.瑙ｅ帇缂╂洿鏂板寘
- unZipPath := configPatchPath+"/"+identifier+"_basic/"
- if util.Exists(unZipPath) {
+ unPackPath := configPatchPath+"/"+identifier+"_basic/"
+ if util.Exists(unPackPath) {
//姝ょ増鏈凡缁忔洿鏂拌繃
- rmErr := os.RemoveAll(unZipPath)
+ rmErr := os.RemoveAll(unPackPath)
if rmErr !=nil {
return false
}
}
- if !util.CreateDirectory(unZipPath) {
+ if !util.CreateDirectory(unPackPath) {
return false
}
zipFilePath := configPatchPath+"/"+identifier+ext
- err := util.UnZip(zipFilePath, unZipPath)
+ err := util.DeCompress(zipFilePath, unPackPath)
if err !=nil {
logger.Debug("UnZip err:",err,"zipFile:",zipFilePath)
return false
}
+
+ //濡傛灉閫氱敤鑴氭湰鏈夋洿鏂帮紝鍒欐洿鏂伴�氱敤鑴氭湰
+ if util.Exists(unPackPath+"updatePatch.sh") {
+ cpStr := fmt.Sprintf("cp %s /opt/vasystem/bin",unPackPath+"updatePatch.sh")
+ b, err := ExecCmd(cpStr)
+ if err != nil {
+ logger.Debug("cp updatePatch.sh to bin err:",err,"result:",string(b))
+ return false
+ }
+ }
+
+ //鍒ゆ柇鏇存柊鍖呴噷鏄惁鏈夎ˉ涓佽剼鏈紝濡傛灉鏈夊垯鎵ц锛屽惁鍒欐墽琛寀pdatePatch.sh
+ updateCmd := fmt.Sprintf("./updatePatch.sh %s %s %s &",unPackPath,zipFilePath,configPatchPath+"/"+identifier)
+ if util.Exists(unPackPath+"upgrade.sh") {
+ updateCmd = fmt.Sprintf("%supgrade.sh %s %s %s",unPackPath,unPackPath,zipFilePath,configPatchPath+"/"+identifier)
+ }
//2.鏇存柊绯荤粺
- var cmd *exec.Cmd
- updateCmd := fmt.Sprintf("./updatePatch.sh %s %s %s &",unZipPath,zipFilePath,configPatchPath+"/"+identifier)
- cmd = exec.Command("/bin/sh","-c", updateCmd)
- if b, err := cmd.Output(); err != nil {
- logger.Debug("updatePatch err:",err,"result:",string(b))
+ b,err := ExecCmd(updateCmd)
+ if err != nil {
+ logger.Debug("upgrade err:",err,"result:",string(b),"cmd:",updateCmd)
return false
} else {
- logger.Debug("updatePatch result:",string(b),"cmd:",updateCmd)
+ logger.Debug("upgrade result:",string(b),"cmd:",updateCmd)
}
return true
}
@@ -239,4 +283,10 @@
logger.Debug("mergeChunks result:",string(b),"cmd: ./mergeAll.sh ", chunkPath, storePath)
return true
}
+}
+
+func ExecCmd(cmdStr string) ([]byte,error) {
+ var cmd *exec.Cmd
+ cmd = exec.Command("/bin/sh", "-c",cmdStr)
+ return cmd.Output()
}
\ No newline at end of file
--
Gitblit v1.8.0