Skip to content

Commit 5d7f31f

Browse files
ssongliussongliu
committed
fix: Fix typo
1 parent d68309f commit 5d7f31f

File tree

9 files changed

+29
-29
lines changed

9 files changed

+29
-29
lines changed

‎agent/app/service/backup_mysql.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ func (u *BackupService) MysqlRecover(req dto.CommonRecover) error {
5757
}
5858

5959
func (u *BackupService) MysqlRecoverByUpload(req dto.CommonRecover) error {
60-
recoveFile, err := loadSqlFile(req.File)
60+
recoverFile, err := loadSqlFile(req.File)
6161
if err != nil {
6262
return err
6363
}
64-
req.File = recoveFile
64+
req.File = recoverFile
6565

6666
if err := handleMysqlRecover(req, nil, false); err != nil {
6767
return err

‎agent/app/service/backup_postgresql.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ func (u *BackupService) PostgresqlRecover(req dto.CommonRecover) error {
5555
}
5656

5757
func (u *BackupService) PostgresqlRecoverByUpload(req dto.CommonRecover) error {
58-
recoveFile, err := loadSqlFile(req.File)
58+
recoverFile, err := loadSqlFile(req.File)
5959
if err != nil {
6060
return err
6161
}
62-
req.File = recoveFile
62+
req.File = recoverFile
6363
if err := handlePostgresqlRecover(req, nil, false); err != nil {
6464
return err
6565
}

‎agent/app/service/cronjob.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ func (u *CronjobService) SearchRecords(search dto.SearchRecord) (int64, interfac
447447
func (u *CronjobService) LoadNextHandle(specStr string) ([]string, error) {
448448
spec := cron.NewParser(cron.Minute | cron.Hour | cron.Dom | cron.Month | cron.Dow)
449449
now := time.Now()
450-
var nexts [5]string
450+
var next [5]string
451451
if strings.HasPrefix(specStr, "@every ") {
452452
duration := time.Minute
453453
if strings.HasSuffix(specStr, "s") {
@@ -462,21 +462,21 @@ func (u *CronjobService) LoadNextHandle(specStr string) ([]string, error) {
462462
}
463463
for i := 0; i < 5; i++ {
464464
nextTime := now.Add(time.Duration(durationItem) * duration)
465-
nexts[i] = nextTime.Format(constant.DateTimeLayout)
465+
next[i] = nextTime.Format(constant.DateTimeLayout)
466466
now = nextTime
467467
}
468-
return nexts[:], nil
468+
return next[:], nil
469469
}
470470
sched, err := spec.Parse(specStr)
471471
if err != nil {
472472
return nil, err
473473
}
474474
for i := 0; i < 5; i++ {
475475
nextTime := sched.Next(now)
476-
nexts[i] = nextTime.Format(constant.DateTimeLayout)
476+
next[i] = nextTime.Format(constant.DateTimeLayout)
477477
now = nextTime
478478
}
479-
return nexts[:], nil
479+
return next[:], nil
480480
}
481481

482482
func (u *CronjobService) LoadRecordLog(req dto.OperateByID) string {
@@ -633,8 +633,8 @@ func (u *CronjobService) HandleStop(id uint) error {
633633
if len(record.TaskID) == 0 {
634634
return nil
635635
}
636-
if cancle, ok := global.TaskCtxMap[record.TaskID]; ok {
637-
cancle()
636+
if cancel, ok := global.TaskCtxMap[record.TaskID]; ok {
637+
cancel()
638638
}
639639
return nil
640640
}

‎agent/app/service/cronjob_backup.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -440,19 +440,19 @@ func loadDbsForJob(cronjob model.Cronjob) []DatabaseHelper {
440440
}
441441

442442
func loadWebsForJob(cronjob model.Cronjob) []model.Website {
443-
var weblist []model.Website
443+
var list []model.Website
444444
if cronjob.Website == "all" {
445-
weblist, _ = websiteRepo.List()
446-
return weblist
445+
list, _ = websiteRepo.List()
446+
return list
447447
}
448448
websites := strings.Split(cronjob.Website, ",")
449449
var idItems []uint
450450
for i := 0; i < len(websites); i++ {
451451
itemID, _ := strconv.Atoi(websites[i])
452452
idItems = append(idItems, uint(itemID))
453453
}
454-
weblist, _ = websiteRepo.GetBy(repo.WithByIDs(idItems))
455-
return weblist
454+
list, _ = websiteRepo.GetBy(repo.WithByIDs(idItems))
455+
return list
456456
}
457457

458458
func handleBackupLogs(taskItem *task.Task, targetDir, fileName string, secret string) error {

‎agent/app/service/cronjob_helper.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ func (u *CronjobService) HandleJob(cronjob *model.Cronjob) {
6464
return
6565
}
6666
if err = u.loadTask(cronjob, &record, taskItem); err != nil {
67-
global.LOG.Debugf("preper to handle cron job [%s] %s failed, err: %v", cronjob.Type, cronjob.Name, err)
67+
global.LOG.Debugf("prepare to handle cron job [%s] %s failed, err: %v", cronjob.Type, cronjob.Name, err)
6868
item, _ := taskRepo.GetFirst(taskRepo.WithByID(record.TaskID))
6969
if len(item.ID) == 0 {
7070
record.TaskID = ""

‎agent/app/service/device_clean.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ func (u *DeviceService) Scan() dto.CleanData {
7878
return common.CompareVersion(upgradeTree.Children[i].Label, upgradeTree.Children[j].Label)
7979
})
8080
if global.IsMaster {
81-
var copiesSeeting model.Setting
82-
_ = global.CoreDB.Where("key = ?", "UpgradeBackupCopies").First(&copiesSeeting).Error
83-
copies, _ := strconv.Atoi(copiesSeeting.Value)
81+
var copiesSetting model.Setting
82+
_ = global.CoreDB.Where("key = ?", "UpgradeBackupCopies").First(&copiesSetting).Error
83+
copies, _ := strconv.Atoi(copiesSetting.Value)
8484
if copies == 0 || copies > len(upgradeTree.Children) {
8585
copies = len(upgradeTree.Children)
8686
}

‎agent/app/service/iptables.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ func initPreRules() error {
363363
return err
364364
}
365365
}
366-
if err := iptables.AddRule(iptables.FilterTab, iptables.Chain1PanelBasicAfter, fmt.Sprintf("-p udp -m udp --dport 443 -j ACCEPT")); err != nil {
366+
if err := iptables.AddRule(iptables.FilterTab, iptables.Chain1PanelBasicAfter, "-p udp -m udp --dport 443 -j ACCEPT"); err != nil {
367367
return err
368368
}
369369
if err := iptables.AddRule(iptables.FilterTab, iptables.Chain1PanelBasicAfter, iptables.DropAllTcp); err != nil {

‎agent/app/service/monitor.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -485,15 +485,15 @@ func loadTopCPU() []dto.Process {
485485
}
486486
name, err := p.Name()
487487
if err != nil {
488-
name = "undifine"
488+
name = "undefined"
489489
}
490490
cmd, err := p.Cmdline()
491491
if err != nil {
492-
cmd = "undifine"
492+
cmd = "undefined"
493493
}
494494
user, err := p.Username()
495495
if err != nil {
496-
user = "undifine"
496+
user = "undefined"
497497
}
498498
if len(top5) == 5 {
499499
top5[minIndex] = dto.Process{Percent: percent, Pid: p.Pid, User: user, Name: name, Cmd: cmd}
@@ -536,15 +536,15 @@ func loadTopMem() []dto.Process {
536536
}
537537
name, err := p.Name()
538538
if err != nil {
539-
name = "undifine"
539+
name = "undefined"
540540
}
541541
cmd, err := p.Cmdline()
542542
if err != nil {
543-
cmd = "undifine"
543+
cmd = "undefined"
544544
}
545545
user, err := p.Username()
546546
if err != nil {
547-
user = "undifine"
547+
user = "undefined"
548548
}
549549
percent, _ := p.MemoryPercent()
550550
if len(top5) == 5 {

‎agent/app/task/task.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,8 @@ func NewTask(name, operate, taskScope, taskID string, resourceID uint) (*Task, e
153153
Operate: operate,
154154
}
155155
taskRepo := repo.NewITaskRepo()
156-
ctx, cancle := context.WithCancel(context.Background())
157-
global.TaskCtxMap[taskID] = cancle
156+
ctx, cancel := context.WithCancel(context.Background())
157+
global.TaskCtxMap[taskID] = cancel
158158
task := &Task{TaskCtx: ctx, Name: name, logFile: logFile, Logger: logger, taskRepo: taskRepo, Task: taskModel}
159159
return task, nil
160160
}

0 commit comments

Comments
 (0)