From 376fa1f36898e60ba2d4e4142499ed6470ab28c0 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Thu, 8 May 2025 15:25:20 +0300
Subject: [PATCH] bridgev2: fix initializing background context

---
 bridgev2/bridge.go | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/bridgev2/bridge.go b/bridgev2/bridge.go
index 2e1fe8f1..bef0c79c 100644
--- a/bridgev2/bridge.go
+++ b/bridgev2/bridge.go
@@ -111,10 +111,6 @@ func (e DBUpgradeError) Unwrap() error {
 }
 
 func (br *Bridge) Start(ctx context.Context) error {
-	if br.backgroundCtx == nil || br.backgroundCtx.Err() != nil {
-		// Ensure we have a valid event handling context
-		br.backgroundCtx, br.cancelBackgroundCtx = context.WithCancel(context.Background())
-	}
 	ctx = br.Log.WithContext(ctx)
 	err := br.StartConnectors(ctx)
 	if err != nil {
@@ -174,6 +170,9 @@ func (br *Bridge) RunOnce(ctx context.Context, loginID networkid.UserLoginID, pa
 
 func (br *Bridge) StartConnectors(ctx context.Context) error {
 	br.Log.Info().Msg("Starting bridge")
+	if br.backgroundCtx == nil || br.backgroundCtx.Err() != nil {
+		br.backgroundCtx, br.cancelBackgroundCtx = context.WithCancel(context.Background())
+	}
 
 	if !br.ExternallyManagedDB {
 		err := br.DB.Upgrade(ctx)