From e0f0035a7d02098f14e9d800a16d42d4c9380e9c Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 20 十二月 2019 16:22:25 +0800
Subject: [PATCH] test
---
service/SysService.go | 81 +++++++++++++++++++++++++++++++++-------
1 files changed, 66 insertions(+), 15 deletions(-)
diff --git a/service/SysService.go b/service/SysService.go
index b4a6bc6..4b14658 100644
--- a/service/SysService.go
+++ b/service/SysService.go
@@ -124,7 +124,7 @@
}
defer file.Close()
writer := bufio.NewWriter(file)
- chunkData := make([]byte, arg.Header.Size)
+ chunkData := make([]byte, arg.CurrentChunkSize)
n, err := (*arg.File).ReadAt(chunkData, 0)
if n ==0 || err !=nil {
logger.Debug("read chunkData err:",err,"n:",n)
@@ -152,6 +152,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,13 +174,13 @@
return false,errors.New("鑾峰彇鍗囩骇鍘嬬缉鍖卪d5澶辫触")
}
if strMd5 == identifier {
- if util.ZipCheck(zipFilePath + ext) {
+ if util.ZipCheck(zipFilePath) {
if !updatePatch(identifier, ext) {
return false,errors.New("鎵ц鍗囩骇杩囩▼寮傚父")
}
return true,nil
} else {
- logger.Debug("not a valid zip file,path:",zipFilePath+ext)
+ logger.Debug("not a valid zip file,path:",zipFilePath)
return false,errors.New("鍗囩骇绋嬪簭瑙ｅ帇澶辫触锛岃纭畾涓婁紶鐨勮ˉ涓佹槸zip鏍煎紡")
}
} else {
@@ -187,6 +190,30 @@
} else {
return false,errors.New("鍗囩骇鏂囦欢宸蹭涪澶憋紝璇烽噸鏂颁笂浼�")
}
+}
+
+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
}
//鏇存柊绯荤粺绋嬪簭
@@ -201,26 +228,44 @@
unZipPath := configPatchPath+"/"+identifier+"_basic/"
if util.Exists(unZipPath) {
//姝ょ増鏈凡缁忔洿鏂拌繃
- return true
- } else {
- if !util.CreateDirectory(unZipPath) {
+ rmErr := os.RemoveAll(unZipPath)
+ if rmErr !=nil {
return false
}
}
- err := util.UnZip(configPatchPath+"/"+identifier+ext, unZipPath)
- if err !=nil {
- logger.Debug("UnZip err:",err,"zipFile:",configPatchPath+"/"+identifier+ext)
+ if !util.CreateDirectory(unZipPath) {
return false
}
+
+ zipFilePath := configPatchPath+"/"+identifier+ext
+ err := util.UnZip(zipFilePath, unZipPath)
+ if err !=nil {
+ logger.Debug("UnZip err:",err,"zipFile:",zipFilePath)
+ return false
+ }
+
+ //濡傛灉閫氱敤鑴氭湰鏈夋洿鏂帮紝鍒欐洿鏂伴�氱敤鑴氭湰
+ if util.Exists(unZipPath+"updatePatch.sh") {
+ cpStr := fmt.Sprintf("cp %s /opt/vasystem/bin",unZipPath+"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 &",unZipPath,zipFilePath,configPatchPath+"/"+identifier)
+ if util.Exists(unZipPath+"upgrade.sh") {
+ updateCmd = fmt.Sprintf("%supgrade.sh %s %s %s &",unZipPath,unZipPath,zipFilePath,configPatchPath+"/"+identifier)
+ }
//2.鏇存柊绯荤粺
- var cmd *exec.Cmd
- updateCmd := fmt.Sprintf("setsid ./updatePatch.sh %s %s %s",unZipPath,configPatchPath+"/"+identifier+ext,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
}
@@ -235,4 +280,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