Skip to content

🐛 fix: list task default #176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 30, 2024
Merged

🐛 fix: list task default #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions cmd/server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions models/task.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
}
Expand All @@ -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
}
Expand Down Expand Up @@ -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
}
Expand Down