diff --git a/cmd/server/server.go b/cmd/server/server.go index 3284998..6c0b438 100644 --- a/cmd/server/server.go +++ b/cmd/server/server.go @@ -231,7 +231,9 @@ type taskE struct { func (t *taskE) Run() { tasks := make([]*models.Task, 0) - err := gormdb.DB.Where("checked_at < ? or checked_at is null", time.Now().Add(-1*time.Minute)). + err := gormdb.DB. + Where("provider = ?", models.TaskProviderDefault). + Where("checked_at < ? or checked_at is null", time.Now().Add(-1*time.Minute)). Where("status = ?", enum.Enabled).Find(&tasks).Error if err != nil { slog.Error("task run get tasks error", slog.Any("err", err)) @@ -246,7 +248,7 @@ func (t *taskE) Run() { } } //check - err = gormdb.DB.Where("status = ?", enum.Enabled).Find(&tasks).Error + err = gormdb.DB.Where("provider = ?", models.TaskProviderDefault).Where("status = ?", enum.Enabled).Find(&tasks).Error if err != nil { slog.Error("task run get tasks error", slog.Any("err", err)) return diff --git a/models/task.go b/models/task.go index ca85a9a..4928705 100644 --- a/models/task.go +++ b/models/task.go @@ -304,7 +304,7 @@ func (t *TaskStorage) Get(key string) (entryID cron.EntryID, spec string, job cr return } tk := &Task{} - if err = t.DB.Where("id = ?", key).First(tk).Error; err != nil { + if err = t.DB.Where("id = ?", key).Where("provider = ?", TaskProviderDefault).First(tk).Error; err != nil { return } return cron.EntryID(tk.EntryID), tk.Spec, tk, true, nil @@ -320,7 +320,7 @@ func (t *TaskStorage) Set(key string, entryID cron.EntryID, spec string, job cro return fmt.Errorf("db is nil") } tk := &Task{} - err := t.DB.Where("id = ?", key).First(tk).Error + err := t.DB.Where("id = ?", key).Where("provider = ?", TaskProviderDefault).First(tk).Error if err != nil { return err } @@ -338,7 +338,7 @@ func (t *TaskStorage) Update(key string, entryID cron.EntryID) error { return fmt.Errorf("db is nil") } tk := &Task{} - err := t.DB.Where("id = ?", key).First(tk).Error + err := t.DB.Where("id = ?", key).Where("provider = ?", TaskProviderDefault).First(tk).Error if err != nil { return err } @@ -371,7 +371,7 @@ func (t *TaskStorage) ListKeys() ([]string, error) { return nil, fmt.Errorf("db is nil") } var tasks []*Task - err := t.DB.Where("status = ?", enum.Enabled).Find(&tasks).Error + err := t.DB.Where("status = ?", enum.Enabled).Where("provider = ?", TaskProviderDefault).Find(&tasks).Error if err != nil { return nil, err }