ayo/houston
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

로그파일에 호스트이름 추가

Browse Source
This commit is contained in:
mountain
2024-06-05 17:26:17 +09:00
parent 4e928f3426
commit dfcb78b70c
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
client/operation.go
View File

@ -93,7 +93,8 @@ func zipLogFiles(storageRoot string, req *shared.UploadRequest) (string, []strin
} }
root = path.Join(root, path.Dir(req.Filter)) root = path.Join(root, path.Dir(req.Filter))
zipFileName := path.Join(os.TempDir(), path.Base(filepath.ToSlash(matches[0]))) + ".zip" hostname, _ := os.Hostname()
zipFileName := path.Join(os.TempDir(), hostname+"_"+path.Base(filepath.ToSlash(matches[0]))) + ".zip"
os.Remove(zipFileName) os.Remove(zipFileName)
f, err := os.OpenFile(zipFileName, os.O_RDWR|os.O_CREATE|os.O_EXCL, 0600) f, err := os.OpenFile(zipFileName, os.O_RDWR|os.O_CREATE|os.O_EXCL, 0600)
@ -537,11 +538,18 @@ func (hc *houstonClient) uploadFiles(req *shared.UploadRequest) error {
if err == nil && len(zipFile) > 0 && len(srcFiles) > 0 { if err == nil && len(zipFile) > 0 && len(srcFiles) > 0 {
if err = hc.uploadZipLogFile(zipFile, child.name, child.version); err == nil { if err = hc.uploadZipLogFile(zipFile, child.name, child.version); err == nil {
// 마지막거 빼고 삭제 // 마지막거 빼고 삭제
sort.StringSlice(srcFiles).Sort() if req.DeleteAfterUploaded == "true" {
for i := 0; i < len(srcFiles)-1; i++ { for i := 0; i < len(srcFiles)-1; i++ {
if len(srcFiles[i]) > 0 {
os.Remove(srcFiles[i]) os.Remove(srcFiles[i])
} }
} else {
sort.StringSlice(srcFiles).Sort()
for i := 0; i < len(srcFiles)-1; i++ {
if len(srcFiles[i]) > 0 {
os.Remove(srcFiles[i])
}
}
} }
} else { } else {
logger.Println("uploadZipLogFile failed :", err) logger.Println("uploadZipLogFile failed :", err)