fix: Try to fix macOS test?

mafredri · mafredri · commit c91637fb64a1 · 2022-06-03T12:44:19.000+03:00
diff --git a/cli/agent.go b/cli/agent.go
@@ -54,15 +54,19 @@ func workspaceAgent() *cobra.Command {
 			logger := slog.Make(sloghuman.Sink(cmd.ErrOrStderr()), sloghuman.Sink(logWriter)).Leveled(slog.LevelDebug)
 			client := codersdk.New(coderURL)
 
+			usr1 := make(chan os.Signal, 1)
 			if pprofEnabled {
+				close(usr1)
 				srvClose := serveHandler(cmd.Context(), logger, nil, pprofAddress, "pprof")
 				defer srvClose()
 			} else {
 				// If pprof wasn't enabled at startup, allow a
 				// `kill -USR1 $agent_pid` to start it.
-				usr1 := make(chan os.Signal, 1)
 				signal.Notify(usr1, syscall.SIGUSR1)
 				go func() {
+					defer close(usr1)
+					defer signal.Stop(usr1)
+
 					select {
 					case <-usr1:
 						signal.Stop(usr1)
@@ -160,6 +164,7 @@ func workspaceAgent() *cobra.Command {
 				},
 			})
 			<-cmd.Context().Done()
+			<-usr1 // Wait for server to close (if started).
 			return closer.Close()
 		},
 	}
