X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/55aafbb07904ca24390dd47ea960eae7cb2b909a..b61a80b93308582b91e89561dc373a1ea33658a9:/services/ws/event_source.go

diff --git a/services/ws/event_source.go b/services/ws/event_source.go
index a4e886872c..cfb828b2a5 100644
--- a/services/ws/event_source.go
+++ b/services/ws/event_source.go
@@ -243,11 +243,13 @@ func (ps *pgEventSource) NewSink() eventSink {
 }
 
 func (ps *pgEventSource) DB() *sql.DB {
+	ps.WaitReady()
 	return ps.db
 }
 
 func (ps *pgEventSource) DBHealth() error {
-	ctx, _ := context.WithDeadline(context.Background(), time.Now().Add(time.Second))
+	ctx, cancel := context.WithDeadline(context.Background(), time.Now().Add(time.Second))
+	defer cancel()
 	var i int
 	return ps.db.QueryRowContext(ctx, "SELECT 1").Scan(&i)
 }