From 18b4c98daa7502b2d12c71a2b5d3eb9c6b60c1fa Mon Sep 17 00:00:00 2001 From: ssongliu <73214554+ssongliu@users.noreply.github.com> Date: Sun, 9 Apr 2023 22:22:13 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=A1=E5=88=92=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=87=AA=E5=AE=9A=E4=B9=89=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E4=BF=9D=E7=95=99=E4=BB=BD=E6=95=B0=20(#548)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/service/cornjob.go | 12 ++--- backend/app/service/cronjob_helper.go | 52 +++++--------------- frontend/src/lang/modules/en.ts | 3 +- frontend/src/lang/modules/zh.ts | 3 +- frontend/src/views/cronjob/index.vue | 14 +----- frontend/src/views/cronjob/operate/index.vue | 20 ++++---- frontend/src/views/cronjob/record/index.vue | 22 ++++++--- 7 files changed, 44 insertions(+), 82 deletions(-) diff --git a/backend/app/service/cornjob.go b/backend/app/service/cornjob.go index 80ceefb97..bb1dda287 100644 --- a/backend/app/service/cornjob.go +++ b/backend/app/service/cornjob.go @@ -80,21 +80,15 @@ func (u *CronjobService) SearchRecords(search dto.SearchRecord) (int64, interfac } func (u *CronjobService) CleanRecord(id uint) error { - _, records, err := cronjobRepo.PageRecords(1, 7, cronjobRepo.WithByJobID(int(id)), commonRepo.WithOrderBy("created_at desc")) - if err != nil { - return err - } - if len(records) < 7 { - return nil - } - delRecords, err := cronjobRepo.ListRecord(cronjobRepo.WithByJobID(int(id)), cronjobRepo.WithByRecordDropID(int(records[6].ID))) + delRecords, err := cronjobRepo.ListRecord(cronjobRepo.WithByJobID(int(id))) if err != nil { return err } for _, del := range delRecords { + _ = os.RemoveAll(del.File) _ = os.RemoveAll(del.Records) } - if err := cronjobRepo.DeleteRecord(cronjobRepo.WithByJobID(int(id)), cronjobRepo.WithByRecordDropID(int(records[6].ID))); err != nil { + if err := cronjobRepo.DeleteRecord(cronjobRepo.WithByJobID(int(id))); err != nil { return err } return nil diff --git a/backend/app/service/cronjob_helper.go b/backend/app/service/cronjob_helper.go index 14b93ca4a..dfbf7f88a 100644 --- a/backend/app/service/cronjob_helper.go +++ b/backend/app/service/cronjob_helper.go @@ -1,7 +1,6 @@ package service import ( - "context" "fmt" "os" "strings" @@ -23,6 +22,7 @@ func (u *CronjobService) HandleJob(cronjob *model.Cronjob) { err error ) record := cronjobRepo.StartRecords(cronjob.ID, cronjob.KeepLocal, "") + logDir := fmt.Sprintf("%s/1panel/task/%s/%s", global.CONF.System.BaseDir, cronjob.Type, cronjob.Name) go func() { switch cronjob.Type { case "shell": @@ -34,6 +34,7 @@ func (u *CronjobService) HandleJob(cronjob *model.Cronjob) { err = errExec } message = []byte(stdout) + u.HandleRmExpired("LOCAL", logDir, cronjob, nil) case "website": record.File, err = u.HandleBackup(cronjob, record.StartTime) case "database": @@ -52,6 +53,7 @@ func (u *CronjobService) HandleJob(cronjob *model.Cronjob) { err = errCurl } message = []byte(stdout) + u.HandleRmExpired("LOCAL", logDir, cronjob, nil) } if err != nil { cronjobRepo.EndRecords(record, constant.StatusFailed, err.Error(), string(message)) @@ -169,39 +171,13 @@ func (u *CronjobService) HandleRmExpired(backType, backupDir string, cronjob *mo } return } - files, err := os.ReadDir(backupDir) - if err != nil { - global.LOG.Errorf("read dir %s failed, err: %v", backupDir, err) - return - } - if len(files) == 0 { - return - } - prefix := "" - switch cronjob.Type { - case "database": - prefix = "db_" - case "website": - prefix = "website_" - case "directory": - prefix = "directory_" - } - - dbCopies := uint64(0) - for i := len(files) - 1; i >= 0; i-- { - if strings.HasPrefix(files[i].Name(), prefix) { - dbCopies++ - if dbCopies > cronjob.RetainCopies { - _ = os.Remove(backupDir + "/" + files[i].Name()) - _ = backupRepo.DeleteRecord(context.Background(), backupRepo.WithByFileName(files[i].Name())) - } - } - } - records, _ := cronjobRepo.ListRecord(cronjobRepo.WithByJobID(int(cronjob.ID))) + records, _ := cronjobRepo.ListRecord(cronjobRepo.WithByJobID(int(cronjob.ID)), commonRepo.WithOrderBy("created_at desc")) if len(records) > int(cronjob.RetainCopies) { for i := int(cronjob.RetainCopies); i < len(records); i++ { - _ = cronjobRepo.DeleteRecord(cronjobRepo.WithByJobID(int(records[i].ID))) + _ = cronjobRepo.DeleteRecord(commonRepo.WithByID(uint(records[i].ID))) + _ = os.Remove(records[i].File) + _ = os.Remove(records[i].Records) } } } @@ -292,7 +268,8 @@ func (u *CronjobService) handleDatabase(cronjob model.Cronjob, app *repo.RootInf record.Source = backup.Type record.FileDir = itemFileDir } - if err := saveBackupRecord(record); err != nil { + if err := backupRepo.CreateRecord(&record); err != nil { + global.LOG.Errorf("save backup record failed, err: %v", err) return err } if backup.Type == "LOCAL" { @@ -356,7 +333,8 @@ func (u *CronjobService) handleWebsite(cronjob model.Cronjob, backup model.Backu return err } record.Name = website.PrimaryDomain - if err := saveBackupRecord(record); err != nil { + if err := backupRepo.CreateRecord(&record); err != nil { + global.LOG.Errorf("save backup record failed, err: %v", err) return err } if backup.Type == "LOCAL" { @@ -382,11 +360,3 @@ func (u *CronjobService) handleWebsite(cronjob model.Cronjob, backup model.Backu } return nil } - -func saveBackupRecord(record model.BackupRecord) error { - if err := backupRepo.CreateRecord(&record); err != nil { - global.LOG.Errorf("save backup record failed, err: %v", err) - return err - } - return nil -} diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts index 99669eb58..156768f21 100644 --- a/frontend/src/lang/modules/en.ts +++ b/frontend/src/lang/modules/en.ts @@ -585,7 +585,7 @@ const message = { cronSpec: 'Lifecycle', cronSpecHelper: 'Enter the correct execution period', cleanHelper: - 'This operation will retain the latest seven task execution records and log files. Do you want to continue?', + 'This operation records all job execution records, backup files, and log files. Do you want to continue?', directory: 'Backup directory', sourceDir: 'Backup directory', allOptionHelper: @@ -595,6 +595,7 @@ const message = { url: 'URL Address', target: 'Target', retainCopies: 'Retain copies', + retainCopiesHelper: 'Number of copies of execution records, log files, and backup files', cronSpecRule: 'Please enter a correct lifecycle', perMonth: 'Every monthly', perWeek: 'Every week', diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts index ceb733b68..12b430a91 100644 --- a/frontend/src/lang/modules/zh.ts +++ b/frontend/src/lang/modules/zh.ts @@ -588,7 +588,7 @@ const message = { taskName: '任务名称', cronSpec: '执行周期', cronSpecHelper: '请输入正确的执行周期', - cleanHelper: '该操作将保留最新的 7 份任务执行记录和日志文件，是否继续？', + cleanHelper: '该操作将所有任务执行记录、备份文件和日志文件，是否继续？', directory: '备份目录', sourceDir: '备份目录', allOptionHelper: '当前计划任务为备份所有 {0}，暂不支持直接下载，可在 {0} 备份列表中查看', @@ -597,6 +597,7 @@ const message = { url: 'URL 地址', target: '备份到', retainCopies: '保留份数', + retainCopiesHelper: '执行记录、日志文件、备份文件保留份数', cronSpecRule: '请输入正确的执行周期', perMonth: '每月', perWeek: '每周', diff --git a/frontend/src/views/cronjob/index.vue b/frontend/src/views/cronjob/index.vue index 1467b8782..ddeb7330d 100644 --- a/frontend/src/views/cronjob/index.vue +++ b/frontend/src/views/cronjob/index.vue @@ -91,11 +91,7 @@ {{ $t('cronjob.handle') }} - - - +