Skip to content

Commit 23a3a5c

Browse files
authored
Fix typo (#11287)
1 parent 0f5410d commit 23a3a5c

File tree

5 files changed

+7
-10
lines changed

5 files changed

+7
-10
lines changed

agent/app/repo/app.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ type IAppRepo interface {
3333
DeleteByIDs(ctx context.Context, ids []uint) error
3434
DeleteBy(opts ...DBOption) error
3535

36-
GetTopRecomment() ([]string, error)
36+
GetTopRecommend() ([]string, error)
3737
}
3838

3939
func NewIAppRepo() IAppRepo {
@@ -124,7 +124,7 @@ func (a AppRepo) GetBy(opts ...DBOption) ([]model.App, error) {
124124
return apps, nil
125125
}
126126

127-
func (a AppRepo) GetTopRecomment() ([]string, error) {
127+
func (a AppRepo) GetTopRecommend() ([]string, error) {
128128
var (
129129
apps []model.App
130130
names []string

agent/app/service/backup_postgresql.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717
"github.com/1Panel-dev/1Panel/agent/utils/common"
1818
"github.com/1Panel-dev/1Panel/agent/utils/files"
1919
"github.com/1Panel-dev/1Panel/agent/utils/postgresql/client"
20-
pgclient "github.com/1Panel-dev/1Panel/agent/utils/postgresql/client"
2120
)
2221

2322
func (u *BackupService) PostgresqlBackup(req dto.CommonBackup) error {
@@ -82,7 +81,7 @@ func handlePostgresqlBackup(db DatabaseHelper, parentTask *task.Task, recordID u
8281
}
8382
}
8483

85-
itemHandler := func() error { return doPostgresqlgBackup(db, targetDir, fileName, secret, backupTask) }
84+
itemHandler := func() error { return doPostgresqlBackup(db, targetDir, fileName, secret, backupTask) }
8685
if parentTask != nil {
8786
return itemHandler()
8887
}
@@ -195,13 +194,13 @@ func handlePostgresqlRecover(req dto.CommonRecover, parentTask *task.Task, isRol
195194
return nil
196195
}
197196

198-
func doPostgresqlgBackup(db DatabaseHelper, targetDir, fileName, secret string, task *task.Task) error {
197+
func doPostgresqlBackup(db DatabaseHelper, targetDir, fileName, secret string, task *task.Task) error {
199198
cli, err := LoadPostgresqlClientByFrom(db.Database)
200199
if err != nil {
201200
return err
202201
}
203202
defer cli.Close()
204-
backupInfo := pgclient.BackupInfo{
203+
backupInfo := client.BackupInfo{
205204
Database: db.Database,
206205
Name: db.Name,
207206
TargetDir: targetDir,

agent/app/service/container.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1144,10 +1144,8 @@ func (u *ContainerService) ContainerStats(id string) (*dto.ContainerStats, error
11441144

11451145
body, err := io.ReadAll(res.Body)
11461146
if err != nil {
1147-
res.Body.Close()
11481147
return nil, err
11491148
}
1150-
res.Body.Close()
11511149
var stats *container.StatsResponse
11521150
if err := json.Unmarshal(body, &stats); err != nil {
11531151
return nil, err

agent/app/service/cronjob_backup.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ func (u *CronjobService) handleDatabase(cronjob model.Cronjob, startTime time.Ti
178178
}
179179
}
180180
} else {
181-
if err := doPostgresqlgBackup(dbInfo, backupDir, record.FileName, cronjob.Secret, taskItem); err != nil {
181+
if err := doPostgresqlBackup(dbInfo, backupDir, record.FileName, cronjob.Secret, taskItem); err != nil {
182182
if retry < int(cronjob.RetryTimes) || !cronjob.IgnoreErr {
183183
retry++
184184
return err

agent/app/service/dashboard.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ func (u *DashboardService) LoadAppLauncher(ctx *gin.Context) ([]dto.AppLauncher,
285285
}
286286

287287
showList, err := launcherRepo.ListName()
288-
defaultList, err := appRepo.GetTopRecomment()
288+
defaultList, err := appRepo.GetTopRecommend()
289289
if err != nil {
290290
return data, nil
291291
}

0 commit comments

Comments
 (0)