Merge pull request #11 from jeessy2:oldBackup

fix: 删除过期文件

Author: jeessy2

client/delete_old_file.go

@@ -12,43 +12,44 @@ import (
 
 // DeleteOldBackup for client
 func DeleteOldBackup() {
-	// sleep 30 minutes
-	time.Sleep(30 * time.Minute)
 	for {
+		delay := util.GetDelaySeconds(2)
+		log.Printf("删除过期的备份文件将在 %.1f 小时后运行\n", delay.Hours())
+		time.Sleep(delay)
+
 		conf, err := entity.GetConfigCache()
-		if err == nil {
-			for _, backupConf := range conf.BackupConfig {
-				// read from current path
-				backupFiles, err := ioutil.ReadDir(backupConf.GetProjectPath())
-				if err != nil {
-					log.Println("Read dir with error :", err)
-					continue
-				}
+		if err != nil {
+			return
+		}
 
-				// delete client files
-				ago := time.Now()
-				for _, conf := range conf.BackupConfig {
-					lastDay, _ := time.ParseDuration("-" + strconv.Itoa(conf.SaveDays*24) + "h")
-					ago = ago.Add(lastDay)
+		for _, backupConf := range conf.BackupConfig {
+			if !backupConf.NotEmptyProject() {
+				continue
+			}
+			// read from current path
+			backupFiles, err := ioutil.ReadDir(backupConf.GetProjectPath())
+			if err != nil {
+				log.Printf("读取项目 %s 目录失败! ERR: %s\n", backupConf.ProjectName, err)
+				continue
+			}
+
+			// delete client files
+			subDuration, _ := time.ParseDuration("-" + strconv.Itoa(backupConf.SaveDays*24) + "h")
+			before := time.Now().Add(subDuration)
 
-					// delete older file when file numbers gt MaxSaveDays
-					for _, backupFile := range backupFiles {
-						if backupFile.ModTime().Before(ago) {
-							filepath := backupConf.GetProjectPath() + "/" + backupFile.Name()
-							err := os.Remove(filepath)
-							if err != nil {
-								log.Printf("删除过期的文件 %s 失败", filepath)
-							} else {
-								log.Printf("删除过期的文件 %s 成功", filepath)
-							}
-						}
+			// delete older file when file numbers gt MaxSaveDays
+			for _, backupFile := range backupFiles {
+				if backupFile.ModTime().Before(before) {
+					filepath := backupConf.GetProjectPath() + string(os.PathSeparator) + backupFile.Name()
+					err := os.Remove(filepath)
+					if err != nil {
+						log.Printf("删除过期的文件 %s 失败", filepath)
+					} else {
+						log.Printf("删除过期的文件 %s 成功", filepath)
 					}
 				}
 			}
-
 		}
-		// sleep
-		util.SleepForFileDelete()
 	}
 
 }

util/time_util.go

@@ -0,0 +1,22 @@
+package util
+
+import (
+	"time"
+)
+
+// GetDelaySeconds 获取第一次启动的延时时间(秒)
+func GetDelaySeconds(startTime int) time.Duration {
+	now := time.Now().Truncate(time.Second)
+	midNightNow := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location())
+	midNightTom := midNightNow.Add(24 * time.Hour)
+
+	var seconds int
+	if now.Hour() >= startTime {
+		// tomorrow
+		seconds = int(midNightTom.Add(time.Hour * time.Duration(startTime)).Sub(now).Seconds())
+	} else {
+		seconds = int(midNightNow.Add(time.Hour * time.Duration(startTime)).Sub(now).Seconds())
+	}
+
+	return time.Second * time.Duration(seconds)
+}

util/time_util_test.go

@@ -0,0 +1,15 @@
+package util
+
+import (
+	"testing"
+	"time"
+)
+
+// TestGetDelaySeconds
+func TestGetDelaySeconds(t *testing.T) {
+	hour := 1
+	runTime := time.Now().Add(GetDelaySeconds(hour))
+	if runTime.Hour() != hour || runTime.Minute() != 0 {
+		t.Error("GetDelaySeconds not correct")
+	}
+}