close order comment, ignore error logs in test

ethanndickson · ethanndickson · commit 6b8100d00db6 · 2024-11-19T06:50:11.000Z
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -1514,6 +1514,8 @@ func (api *API) Close() error {
 	if api.derpCloseFunc != nil {
 		api.derpCloseFunc()
 	}
+	// The coordinator should be closed after the agent provider, and the DERP
+	// handler.
 	coordinator := api.TailnetCoordinator.Load()
 	if coordinator != nil {
 		_ = (*coordinator).Close()
diff --git a/enterprise/coderd/coderd_test.go b/enterprise/coderd/coderd_test.go
@@ -733,7 +733,7 @@ func TestConn_CoordinatorRollingRestart(t *testing.T) {
 			dv := coderdtest.DeploymentValues(t, func(dv *codersdk.DeploymentValues) {
 				dv.DERP.Config.BlockDirect = serpent.Bool(!direct)
 			})
-			logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+			logger := slogtest.Make(t, &slogtest.Options{IgnoreErrors: true}).Leveled(slog.LevelDebug)
 
 			// Create two restartable test servers with the same database.
 			client1, user, s1 := newRestartableTestServer(t, &coderdenttest.Options{

Original file line number	Diff line number	Diff line change
`@@ -1514,6 +1514,8 @@ func (api *API) Close() error {`
`1514`	`1514`	`if api.derpCloseFunc != nil {`
`1515`	`1515`	`api.derpCloseFunc()`
`1516`	`1516`	`}`
	`1517`	`+ // The coordinator should be closed after the agent provider, and the DERP`
	`1518`	`+ // handler.`
`1517`	`1519`	`coordinator := api.TailnetCoordinator.Load()`
`1518`	`1520`	`if coordinator != nil {`
`1519`	`1521`	`_ = (*coordinator).Close()`