1
0
Эх сурвалжийг харах

Check days (#29)

* fix: 对象存储设置需要保存

* fix: 校验输入的天数才执行删除
jeessy2 3 жил өмнө
parent
commit
7426ab59b7

+ 8 - 0
client/delete_old_file.go

@@ -41,6 +41,10 @@ func deleteLocalOlderFiles(backupConf entity.BackupConfig) {
 	if err != nil {
 		log.Printf("读取项目 %s 的本地目录失败! ERR: %s\n", backupConf.ProjectName, err)
 	}
+	if backupConf.SaveDays <= 0 {
+		log.Printf("项目 %s 的本地保存(天)设置不正确", backupConf.ProjectName)
+		return
+	}
 	backupFileNames := make([]string, len(backupFiles))
 	for _, backupFile := range backupFiles {
 		backupFileNames = append(backupFileNames, backupFile.Name())
@@ -63,6 +67,10 @@ func deleteS3OlderFiles(s3Conf entity.S3Config, backupConf entity.BackupConfig)
 	if !s3Conf.CheckNotEmpty() {
 		return
 	}
+	if backupConf.SaveDaysS3 <= 0 {
+		log.Printf("项目 %s 的对象存储保存(天)设置不正确", backupConf.ProjectName)
+		return
+	}
 	fileNames, err := s3Conf.ListFiles(backupConf.GetProjectPath())
 	if err != nil {
 		log.Printf("读取项目 %s 的对象存储目录失败! ERR: %s\n", backupConf.ProjectName, err)

+ 2 - 0
web/save.go

@@ -44,6 +44,7 @@ func Save(writer http.ResponseWriter, request *http.Request) {
 	forms := request.PostForm
 	for index, projectName := range forms["ProjectName"] {
 		saveDays, _ := strconv.Atoi(forms["SaveDays"][index])
+		saveDaysS3, _ := strconv.Atoi(forms["SaveDaysS3"][index])
 		startTime, _ := strconv.Atoi(forms["StartTime"][index])
 		period, _ := strconv.Atoi(forms["Period"][index])
 		conf.BackupConfig = append(
@@ -52,6 +53,7 @@ func Save(writer http.ResponseWriter, request *http.Request) {
 				ProjectName: projectName,
 				Command:     forms["Command"][index],
 				SaveDays:    saveDays,
+				SaveDaysS3:  saveDaysS3,
 				StartTime:   startTime,
 				Period:      period,
 				Pwd:         forms["Pwd"][index],