feat: 有任务运行则跳过自动更新

tnb-labs · Jan 2, 2025 · a573a6e · a573a6e
1 parent d6b016d
commit a573a6e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/cmd/web/wire_gen.go b/cmd/web/wire_gen.go
diff --git a/internal/job/job.go b/internal/job/job.go
@@ -19,16 +19,18 @@ type Jobs struct {
 	cert    biz.CertRepo
 	backup  biz.BackupRepo
 	cache   biz.CacheRepo
+	task    biz.TaskRepo
 }
 
-func NewJobs(db *gorm.DB, log *slog.Logger, setting biz.SettingRepo, cert biz.CertRepo, backup biz.BackupRepo, cache biz.CacheRepo) *Jobs {
+func NewJobs(db *gorm.DB, log *slog.Logger, setting biz.SettingRepo, cert biz.CertRepo, backup biz.BackupRepo, cache biz.CacheRepo, task biz.TaskRepo) *Jobs {
 	return &Jobs{
 		db:      db,
 		log:     log,
 		setting: setting,
 		cert:    cert,
 		backup:  backup,
 		cache:   cache,
+		task:    task,
 	}
 }
 
@@ -40,7 +42,7 @@ func (r *Jobs) Register(c *cron.Cron) error {
 		return err
 	}
 
-	if _, err := c.AddJob("0 2 * * *", NewPanelTask(r.db, r.log, r.backup, r.cache, r.setting)); err != nil {
+	if _, err := c.AddJob("0 2 * * *", NewPanelTask(r.db, r.log, r.backup, r.cache, r.task, r.setting)); err != nil {
 		return err
 	}
 

diff --git a/internal/job/panel_task.go b/internal/job/panel_task.go
@@ -23,16 +23,18 @@ type PanelTask struct {
 	log         *slog.Logger
 	backupRepo  biz.BackupRepo
 	cacheRepo   biz.CacheRepo
+	taskRepo    biz.TaskRepo
 	settingRepo biz.SettingRepo
 }
 
-func NewPanelTask(db *gorm.DB, log *slog.Logger, backup biz.BackupRepo, cache biz.CacheRepo, setting biz.SettingRepo) *PanelTask {
+func NewPanelTask(db *gorm.DB, log *slog.Logger, backup biz.BackupRepo, cache biz.CacheRepo, task biz.TaskRepo, setting biz.SettingRepo) *PanelTask {
 	return &PanelTask{
 		api:         api.NewAPI(app.Version),
 		db:          db,
 		log:         log,
 		backupRepo:  backup,
 		cacheRepo:   cache,
+		taskRepo:    task,
 		settingRepo: setting,
 	}
 }
@@ -100,6 +102,10 @@ func (r *PanelTask) updateRewrites() {
 
 // 更新面板
 func (r *PanelTask) updatePanel() {
+	if r.taskRepo.HasRunningTask() {
+		return
+	}
+
 	// 加 300 秒确保在缓存更新后才更新面板
 	time.AfterFunc(time.Duration(rand.IntN(300))*time.Second+300*time.Second, func() {
 		panel, err := r.api.LatestVersion()