particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

dbjobqueue: use background context when closing listener

Browse source
This commit is contained in:
Lukas Zapletal 2022-06-03 17:01:38 +02:00 • committed by Ondřej Budai
parent 6a2e719c76
commit b03a131f13
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
cmd/osbuild-composer-dbjobqueue-tests/main_test.go
View file

@ -1,3 +1,4 @@
//go:build integration
// +build integration // +build integration
package main package main

3
pkg/jobqueue/dbjobqueue/dbjobqueue.go
View file

@ -182,7 +182,8 @@ func (q *DBJobQueue) listen(ctx context.Context, ready chan<- struct{}) {
panic(fmt.Errorf("error connecting to database: %v", err)) panic(fmt.Errorf("error connecting to database: %v", err))
} }
defer func() { defer func() {
_, err := conn.Exec(ctx, sqlUnlisten) // use the empty context as the listening context is already cancelled at this point
_, err := conn.Exec(context.Background(), sqlUnlisten)
if err != nil && !errors.Is(err, context.DeadlineExceeded) { if err != nil && !errors.Is(err, context.DeadlineExceeded) {
logrus.Error("Error unlistening for jobs in dequeue: ", err) logrus.Error("Error unlistening for jobs in dequeue: ", err)
} }