Mar 26, 2022 · Mar 26, 2022
diff --git a/coderd/coderd.go b/coderd/coderd.go
 })
 })
 r.NotFound(site.DefaultHandler().ServeHTTP)
 return r, api.websocketWaitGroup.Wait
 return r, func() {
 api.websocketWaitMutex.Lock()
 api.websocketWaitGroup.Wait()
 api.websocketWaitMutex.Unlock()
 }
 }

 // API contains all route handlers. Only HTTP handlers should
 // be added to this struct for code clarity.
 type api struct {
 *Options

 websocketWaitMutex sync.Mutex
 websocketWaitGroup sync.WaitGroup
 }
diff --git a/coderd/provisionerdaemons.go b/coderd/provisionerdaemons.go

 // Serves the provisioner daemon protobuf API over a WebSocket.
 func (api *api) provisionerDaemonsListen(rw http.ResponseWriter, r *http.Request) {
 api.websocketWaitMutex.Lock()
 api.websocketWaitGroup.Add(1)
 api.websocketWaitMutex.Unlock()
 defer api.websocketWaitGroup.Done()

 conn, err := websocket.Accept(rw, r, &websocket.AcceptOptions{
diff --git a/coderd/workspaceresources.go b/coderd/workspaceresources.go
 }

 func (api *api) workspaceResourceDial(rw http.ResponseWriter, r *http.Request) {
 api.websocketWaitMutex.Lock()
 api.websocketWaitGroup.Add(1)
 api.websocketWaitMutex.Unlock()
 defer api.websocketWaitGroup.Done()

 resource := httpmw.WorkspaceResourceParam(r)
 }

 func (api *api) workspaceAgentListen(rw http.ResponseWriter, r *http.Request) {
 api.websocketWaitMutex.Lock()
 api.websocketWaitGroup.Add(1)
 api.websocketWaitMutex.Unlock()
 defer api.websocketWaitGroup.Done()

 agent := httpmw.WorkspaceAgent(r)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -176,13 +176,18 @@ func New(options *Options) (http.Handler, func()) {
		})
		})
		r.NotFound(site.DefaultHandler().ServeHTTP)
		return r, api.websocketWaitGroup.Wait
		return r, func() {
		api.websocketWaitMutex.Lock()
		api.websocketWaitGroup.Wait()
		api.websocketWaitMutex.Unlock()
		}
		}

		// API contains all route handlers. Only HTTP handlers should
		// be added to this struct for code clarity.
		type api struct {
		*Options

		websocketWaitMutex sync.Mutex
		websocketWaitGroup sync.WaitGroup
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -33,7 +33,9 @@ import (

		// Serves the provisioner daemon protobuf API over a WebSocket.
		func (api api) provisionerDaemonsListen(rw http.ResponseWriter, r http.Request) {
		api.websocketWaitMutex.Lock()
		api.websocketWaitGroup.Add(1)
		api.websocketWaitMutex.Unlock()
		defer api.websocketWaitGroup.Done()

		conn, err := websocket.Accept(rw, r, &websocket.AcceptOptions{
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -64,7 +64,9 @@ func (api api) workspaceResource(rw http.ResponseWriter, r http.Request) {
		}

		func (api api) workspaceResourceDial(rw http.ResponseWriter, r http.Request) {
		api.websocketWaitMutex.Lock()
		api.websocketWaitGroup.Add(1)
		api.websocketWaitMutex.Unlock()
		defer api.websocketWaitGroup.Done()

		resource := httpmw.WorkspaceResourceParam(r)
Expand DownExpand Up		@@ -112,7 +114,9 @@ func (api api) workspaceResourceDial(rw http.ResponseWriter, r http.Request) {
		}

		func (api api) workspaceAgentListen(rw http.ResponseWriter, r http.Request) {
		api.websocketWaitMutex.Lock()
		api.websocketWaitGroup.Add(1)
		api.websocketWaitMutex.Unlock()
		defer api.websocketWaitGroup.Done()

		agent := httpmw.WorkspaceAgent(r)
Expand Down