must release before ondisconnect or we have lock contention

jakecoffman · jakecoffman · commit 545cf6af4541 · 2019-11-11T10:37:13.000-06:00
diff --git a/ws_server.go b/ws_server.go
@@ -71,13 +71,14 @@ func (s *WebsocketServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 
 	writer := tunnel.AcquireWriter()
 	reader := tunnel.AcquireReader()
-	defer tunnel.ReleaseWriter()
-	defer tunnel.ReleaseReader()
 
 	if s.OnDisconnect != nil {
 		defer s.OnDisconnect(id, r, tunnel)
 	}
 
+	defer tunnel.ReleaseWriter()
+	defer tunnel.ReleaseReader()
+
 	go wsToGuacd(ws, writer)
 	guacdToWs(ws, reader)
 }

Original file line number	Diff line number	Diff line change
`@@ -71,13 +71,14 @@ func (s WebsocketServer) ServeHTTP(w http.ResponseWriter, r http.Request) {`
`71`	`71`
`72`	`72`	`writer := tunnel.AcquireWriter()`
`73`	`73`	`reader := tunnel.AcquireReader()`
`74`		`- defer tunnel.ReleaseWriter()`
`75`		`- defer tunnel.ReleaseReader()`
`76`	`74`
`77`	`75`	`if s.OnDisconnect != nil {`
`78`	`76`	`defer s.OnDisconnect(id, r, tunnel)`
`79`	`77`	`}`
`80`	`78`
	`79`	`+ defer tunnel.ReleaseWriter()`
	`80`	`+ defer tunnel.ReleaseReader()`
	`81`	`+`
`81`	`82`	`go wsToGuacd(ws, writer)`
`82`	`83`	`guacdToWs(ws, reader)`
`83`	`84`	`}`