Permalink
Browse files

livereload: Fix data race in close

Fixes #2625
  • Loading branch information...
bep committed Apr 29, 2017
1 parent 93a447c commit 355736ec357c81dfb2eb6851ee019d407090c5ec
Showing with 13 additions and 2 deletions.
  1. +11 −0 livereload/connection.go
  2. +2 −2 livereload/hub.go
View
@@ -15,6 +15,7 @@ package livereload
import (
"bytes"
"sync"
"github.com/gorilla/websocket"
)
@@ -25,6 +26,16 @@ type connection struct {
// Buffered channel of outbound messages.
send chan []byte
// There is a potential data race, especially visible with large files.
// This is protected by synchronisation of the send channel's close.
closer sync.Once
}
func (c *connection) close() {
c.closer.Do(func() {
close(c.send)
})
}
func (c *connection) reader() {
View
@@ -41,14 +41,14 @@ func (h *hub) run() {
h.connections[c] = true
case c := <-h.unregister:
delete(h.connections, c)
close(c.send)
c.close()
case m := <-h.broadcast:
for c := range h.connections {
select {
case c.send <- m:
default:
delete(h.connections, c)
close(c.send)
c.close()
}
}
}

0 comments on commit 355736e

Please sign in to comment.