Skip to content

Pull most notification topic names from code #136

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
bgentry merged 1 commit into from
Dec 31, 2023
Merged

Pull most notification topic names from code #136

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 internal/dbadapter/db_adapter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (

"github.com/riverqueue/river/internal/baseservice"
"github.com/riverqueue/river/internal/dbsqlc"
"github.com/riverqueue/river/internal/notifier"
"github.com/riverqueue/river/internal/util/dbutil"
"github.com/riverqueue/river/internal/util/hashutil"
"github.com/riverqueue/river/internal/util/ptrutil"
Expand Down Expand Up @@ -446,7 +447,8 @@ func (a *StandardAdapter) LeadershipResign(ctx context.Context, name, leaderID s
defer cancel()

return a.queries.LeadershipResign(ctx, a.executor, dbsqlc.LeadershipResignParams{
LeaderID: leaderID,
Name: name,
LeaderID: leaderID,
LeadershipTopic: string(notifier.NotificationTopicLeadership),
Name: name,
})
}
2 changes: 1 addition & 1 deletion internal/dbsqlc/river_job.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ river_job_scheduled AS (
)
SELECT count(*)
FROM (
SELECT pg_notify('river_insert', json_build_object('queue', queue)::text)
SELECT pg_notify(@insert_topic, json_build_object('queue', queue)::text)
FROM river_job_scheduled) AS notifications_sent;

-- name: JobSetState :one
Expand Down
13 changes: 7 additions & 6 deletions internal/dbsqlc/river_job.sql.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/dbsqlc/river_leader.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ WITH currently_held_leaders AS (
),
notified_resignations AS (
SELECT
pg_notify('river_leadership', json_build_object('name', name, 'leader_id', leader_id, 'action', 'resigned')::text),
pg_notify(@leadership_topic, json_build_object('name', name, 'leader_id', leader_id, 'action', 'resigned')::text),
currently_held_leaders.name
FROM
currently_held_leaders)
Expand Down
9 changes: 5 additions & 4 deletions internal/dbsqlc/river_leader.sql.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions internal/maintenance/scheduler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"github.com/riverqueue/river/internal/baseservice"
"github.com/riverqueue/river/internal/dbsqlc"
"github.com/riverqueue/river/internal/maintenance/startstop"
"github.com/riverqueue/river/internal/notifier"
"github.com/riverqueue/river/internal/rivercommon"
"github.com/riverqueue/river/internal/util/dbutil"
"github.com/riverqueue/river/internal/util/timeutil"
Expand Down Expand Up @@ -139,8 +140,9 @@ func (s *Scheduler) runOnce(ctx context.Context) (*schedulerRunOnceResult, error
defer cancelFunc()

numScheduled, err := s.queries.JobSchedule(ctx, s.dbExecutor, dbsqlc.JobScheduleParams{
Max: int64(s.config.Limit),
Now: s.TimeNowUTC(),
InsertTopic: string(notifier.NotificationTopicInsert),
Max: int64(s.config.Limit),
Now: s.TimeNowUTC(),
})
if err != nil {
return 0, fmt.Errorf("error deleting completed jobs: %w", err)
Expand Down