From cb85860ff6725aaf66c110d8b9c756608ad54cd1 Mon Sep 17 00:00:00 2001
From: ssongliu <73214554+ssongliu@users.noreply.github.com>
Date: Thu, 11 Jan 2024 13:53:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E7=BD=91=E7=AB=99?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=88=87=E5=89=B2=E5=A4=B1=E8=B4=A5=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20(#3573)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/app/service/cronjob_helper.go | 4 ----
 backend/app/service/database.go       | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

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
 			}
 		}