diff --git a/backend/app/service/cronjob_helper.go b/backend/app/service/cronjob_helper.go index 32e3f479c..79c49525a 100644 --- a/backend/app/service/cronjob_helper.go +++ b/backend/app/service/cronjob_helper.go @@ -7,7 +7,6 @@ import ( "path" "strconv" "strings" - "sync" "time" "github.com/1Panel-dev/1Panel/backend/buserr" @@ -351,8 +350,6 @@ func (u *CronjobService) handleCutWebsiteLog(cronjob *model.Cronjob, startTime t } baseDir := path.Join(nginx.GetPath(), "www", "sites") fileOp := files.NewFileOp() - var wg sync.WaitGroup - wg.Add(len(websites)) for _, website := range websites { websiteLogDir := path.Join(baseDir, website.Alias, "log") srcAccessLogPath := path.Join(websiteLogDir, "access.log") @@ -380,7 +377,6 @@ func (u *CronjobService) handleCutWebsiteLog(cronjob *model.Cronjob, startTime t global.LOG.Infof(msg) msgs = append(msgs, msg) } - wg.Wait() u.HandleRmExpired("LOCAL", "", "", cronjob, nil) return msgs, strings.Join(filePaths, ","), err } diff --git a/backend/app/service/database.go b/backend/app/service/database.go index 9cfa8aca5..4ae131e5f 100644 --- a/backend/app/service/database.go +++ b/backend/app/service/database.go @@ -238,7 +238,7 @@ func (u *DatabaseService) Delete(req dto.DatabaseDelete) error { return err } } else { - if err := postgresqlRepo.Delete(context.Background(), mysqlRepo.WithByMysqlName(db.Name)); err != nil && !req.ForceDelete { + if err := postgresqlRepo.Delete(context.Background(), postgresqlRepo.WithByPostgresqlName(db.Name)); err != nil && !req.ForceDelete { return err } }