提交代码

services/cloudbrain/clear.go

@@ -69,7 +69,8 @@ func clearMinioHistoryTrashFile() {
 		SortModTimeAscend(miniofiles)
 		for _, file := range miniofiles {
 
-			if file.ModTime().Before(time.Now().AddDate(0, 0, -setting.ClearStrategy.TrashSaveDays)) {
+			if file.Name()!="" && file.ModTime().Before(time.Now().AddDate(0, 0, -setting.ClearStrategy.TrashSaveDays)) {
+
 				has,err:=models.IsCloudbrainExistByJobName(file.Name())
 				if err==nil && !has {
 					dirPath := setting.CBCodePathPrefix + file.Name() + "/"
@@ -98,7 +99,7 @@ func clearLocalHistoryTrashFile()  {
 		SortModTimeAscend(files)
 		for _, file := range files {
 			//清理n天前的历史垃圾数据，清理job目录
-			if file.ModTime().Before(time.Now().AddDate(0, 0, -setting.ClearStrategy.TrashSaveDays)) {
+			if file.Name()!="" && file.ModTime().Before(time.Now().AddDate(0, 0, -setting.ClearStrategy.TrashSaveDays)) {
 				has,err:=models.IsCloudbrainExistByJobName(file.Name())
 				if err==nil && !has{
 					os.RemoveAll(setting.JobPath + file.Name())
@@ -125,6 +126,10 @@ func SortModTimeAscend(files []os.FileInfo) {
 }
 
 func DeleteCloudbrainOneJobStorage(jobName string) error {
+
+	if jobName==""{
+		return nil
+	}
 	//delete local
 	localJobPath := setting.JobPath + jobName
 	err := os.RemoveAll(localJobPath)