highperfocused/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-07-19 09:32:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6380 from guggero/websocket-proxy-race-fix

Browse Source 
lnrpc: fix websocket proxy data race
This commit is contained in:
Oliver Gugger
2022-03-30 18:13:55 +02:00
committed by GitHub
parent 6275a78c79 de9d3096c0
commit 8072b20d54
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/release-notes/release-notes-0.15.0.md
View File

@ -72,6 +72,9 @@ then watch it on chain. Taproot script spends are also supported through the
`lncli walletbalance` in existing wallets after upgrading to `lncli walletbalance` in existing wallets after upgrading to
Taproot](https://github.com/lightningnetwork/lnd/pull/6379). Taproot](https://github.com/lightningnetwork/lnd/pull/6379).
* [Fixed a data race in the websocket proxy
code](https://github.com/lightningnetwork/lnd/pull/6380).
## Misc ## Misc
* [An example systemd service file](https://github.com/lightningnetwork/lnd/pull/6033) * [An example systemd service file](https://github.com/lightningnetwork/lnd/pull/6033)

4
lnrpc/websocket_proxy.go
View File

@ -253,7 +253,7 @@ func (p *WebsocketProxy) upgradeToWebSocketProxy(w http.ResponseWriter,
payload = newPayload payload = newPayload
} }
_, err = requestForwarder.Write(payload) _, err := requestForwarder.Write(payload)
if err != nil { if err != nil {
p.logger.Errorf("WS: error writing message "+ p.logger.Errorf("WS: error writing message "+
"to upstream http server: %v", err) "to upstream http server: %v", err)
@ -338,7 +338,7 @@ func (p *WebsocketProxy) upgradeToWebSocketProxy(w http.ResponseWriter,
continue continue
} }
err = conn.WriteMessage( err := conn.WriteMessage(
websocket.TextMessage, responseForwarder.Bytes(), websocket.TextMessage, responseForwarder.Bytes(),
) )
if err != nil { if err != nil {