Merge branch 'dk/enable-prebuilds' of github.com:/coder/coder into dk/enable-prebuilds

dannykopping · dannykopping · commit 909dd059a741 · 2025-04-23T14:10:13.000+02:00
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -1663,7 +1663,7 @@ func (api *API) Close() error {
 	_ = api.UpdatesProvider.Close()
 
 	if current := api.PrebuildsReconciler.Load(); current != nil {
-		ctx, giveUp := context.WithTimeoutCause(context.Background(), time.Second*30, xerrors.New("gave up waiting for reconciler to stop"))
+		ctx, giveUp := context.WithTimeoutCause(context.Background(), time.Second*30, xerrors.New("gave up waiting for reconciler to stop before shutdown"))
 		defer giveUp()
 		(*current).Stop(ctx, nil)
 	}

Original file line number	Diff line number	Diff line change
`@@ -1663,7 +1663,7 @@ func (api *API) Close() error {`
`1663`	`1663`	`_ = api.UpdatesProvider.Close()`
`1664`	`1664`
`1665`	`1665`	`if current := api.PrebuildsReconciler.Load(); current != nil {`
`1666`		`- ctx, giveUp := context.WithTimeoutCause(context.Background(), time.Second*30, xerrors.New("gave up waiting for reconciler to stop"))`
	`1666`	`+ ctx, giveUp := context.WithTimeoutCause(context.Background(), time.Second*30, xerrors.New("gave up waiting for reconciler to stop before shutdown"))`
`1667`	`1667`	`defer giveUp()`
`1668`	`1668`	`(*current).Stop(ctx, nil)`
`1669`	`1669`	`}`