fix: Defer close of nhooyr/websocket to wait for exit

kylecarbs · kylecarbs · commit cf88945e0bf7 · 2022-02-20T20:08:04.000Z
nhooyr/websocket properly awaits for the close status to send. We
must wait for the connection to close before returning the handler.
diff --git a/coderd/provisionerdaemons.go b/coderd/provisionerdaemons.go
@@ -100,7 +100,9 @@ func (api *api) provisionerDaemonsServe(rw http.ResponseWriter, r *http.Request)
 	err = server.Serve(r.Context(), session)
 	if err != nil {
 		_ = conn.Close(websocket.StatusInternalError, fmt.Sprintf("serve: %s", err))
+		return
 	}
+	_ = conn.Close(websocket.StatusNormalClosure, "")
 }
 
 // The input for a "workspace_provision" job.

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,9 @@ func (api api) provisionerDaemonsServe(rw http.ResponseWriter, r http.Request)`
`100`	`100`	`err = server.Serve(r.Context(), session)`
`101`	`101`	`if err != nil {`
`102`	`102`	`_ = conn.Close(websocket.StatusInternalError, fmt.Sprintf("serve: %s", err))`
	`103`	`+ return`
`103`	`104`	`}`
	`105`	`+ _ = conn.Close(websocket.StatusNormalClosure, "")`
`104`	`106`	`}`
`105`	`107`
`106`	`108`	`// The input for a "workspace_provision" job.`