synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-15 22:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Use sync.WaitGroup to await hijacked HTTP connections (#337)

Browse Source 
WebSockets hijack the HTTP connection from the server, causing
server.Close() to not wait for these connections to fully cleanup.

This adds a global wait-group to the coderd API, which ensures all
WebSocket HTTP handlers have properly exited before returning.
This commit is contained in:
Kyle Carberry
2022-02-20 16:29:16 -06:00
committed by GitHub
parent 3c04c7f3e6
commit d04570ad29
4 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
coderd/cmd/root.go
View File

@ -33,7 +33,7 @@ func Root() *cobra.Command {
Use: "coderd",
RunE: func(cmd *cobra.Command, args []string) error {
logger := slog.Make(sloghuman.Sink(os.Stderr))
handler := coderd.New(&coderd.Options{
handler, closeCoderd := coderd.New(&coderd.Options{
Logger: logger,
Database: databasefake.New(),
Pubsub: database.NewPubsubInMemory(),
@ -49,11 +49,11 @@ func Root() *cobra.Command {
Scheme: "http",
Host: address,
})
closer, err := newProvisionerDaemon(cmd.Context(), client, logger)
daemonClose, err := newProvisionerDaemon(cmd.Context(), client, logger)
if err != nil {
return xerrors.Errorf("create provisioner daemon: %w", err)
}
defer closer.Close()
defer daemonClose.Close()
errCh := make(chan error)
go func() {
@ -61,6 +61,7 @@ func Root() *cobra.Command {
errCh <- http.Serve(listener, handler)
}()
closeCoderd()
select {
case <-cmd.Context().Done():
return cmd.Context().Err()