From c2f8c24f1ddb67f890f9ac4af5328e65a46aab75 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 20 十二月 2019 16:35:46 +0800
Subject: [PATCH] test
---
service/SysService.go | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/service/SysService.go b/service/SysService.go
index 9fa1619..92957eb 100644
--- a/service/SysService.go
+++ b/service/SysService.go
@@ -130,11 +130,13 @@
logger.Debug("read chunkData err:",err,"n:",n)
return false
}
+ logger.Debug("read currentChunkData len:",n,"header data len:",arg.Header.Size,"data:",string(chunkData))
nn, err2 := writer.Write(chunkData)
if nn ==0 || err2 !=nil {
logger.Debug("write chunkData err:",err2,"nn:",nn)
return false
}
+ logger.Debug("write chunkData len:",nn)
isComplete := false
dirFiles, _ := ioutil.ReadDir(fileTmpPath)
if dirFiles != nil && len(dirFiles) == arg.TotalChunks {
@@ -243,20 +245,29 @@
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)
- logger.Debug("upgrade use ",unZipPath,"upgrade.sh")
}
//2.鏇存柊绯荤粺
- var cmd *exec.Cmd
- 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
}
--
Gitblit v1.8.0