Get up and running with Kimi, GLM, MiniMax, DeepSeek, gpt-oss, Qwen, Gemma and other models.
app/updater: drain background update-check goroutine before returning (#17446)
Daniel Hiltgenb63eed94b6d3
diff --git a/app/updater/updater.go b/app/updater/updater.goindex 06b3fd8db..e042807fe 100644--- a/app/updater/updater.go+++ b/app/updater/updater.go@@ -153,10 +153,12 @@ func (u *Updater) DownloadNewRelease(ctx context.Context, updateResp UpdateResporeturn err}- // In case of slow downloads, continue the update check in the background+ // In case of slow downloads, continue the update check in the background.+ // Drain the goroutine before returning: it reads package-level knobs+ // (e.g. UpdateCheckInterval), which callers may mutate once we return.bgctx, bgcancel := context.WithCancel(downloadCtx)- defer bgcancel()- go func() {+ var bgwg sync.WaitGroup+ bgwg.Go(func() {for {select {case <-bgctx.Done():@@ -165,6 +167,10 @@ func (u *Updater) DownloadNewRelease(ctx context.Context, updateResp UpdateRespou.checkForUpdate(bgctx)}}+ })+ defer func() {+ bgcancel()+ bgwg.Wait()}()resp, err := http.DefaultClient.Do(req)diff --git a/app/updater/updater_test.go b/app/updater/updater_test.goindex fdca50375..7a27599cd 100644--- a/app/updater/updater_test.go+++ b/app/updater/updater_test.go@@ -577,7 +577,9 @@ func TestCancelOngoingDownload(t *testing.T) {_, resp := updater.checkForUpdate(ctx)// Start download in goroutine+ downloadDone := make(chan struct{})go func() {+ defer close(downloadDone)_ = updater.DownloadNewRelease(ctx, resp)}()@@ -598,6 +600,10 @@ func TestCancelOngoingDownload(t *testing.T) {case <-time.After(2 * time.Second):t.Fatal("download cancellation was not received by server")}++ // Wait for the download goroutine to unwind: it drags along a background+ // update-check loop that reads package-level knobs the next test rewrites.+ <-downloadDone}func TestTriggerImmediateCheck(t *testing.T) {