docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2013 from allencloud/add-read-lock-only-when-necessary 

add read lock for eventsHandler when only it is necessary.
This commit is contained in:
Morgan Bauer 2016-03-25 10:32:38 -07:00
parent 510ea94890 c04cae5bf0
commit 3990430ab1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/events.go
View File

@ -73,8 +73,6 @@ func (eh *eventsHandler) cleanupHandler(remoteAddr string) {
// Handle writes information about a cluster event to each remote address in the cluster that has been added to the events handler. // Handle writes information about a cluster event to each remote address in the cluster that has been added to the events handler.
// After an unsuccessful write to a remote address, the associated channel is closed and the address is removed from the events handler. // After an unsuccessful write to a remote address, the associated channel is closed and the address is removed from the events handler.
func (eh *eventsHandler) Handle(e *cluster.Event) error { func (eh *eventsHandler) Handle(e *cluster.Event) error {
eh.RLock()
// remove this hack once 1.10 is broadly adopted // remove this hack once 1.10 is broadly adopted
from := e.From from := e.From
e.From = e.From + " node:" + e.Engine.Name e.From = e.From + " node:" + e.Engine.Name
@ -109,6 +107,8 @@ func (eh *eventsHandler) Handle(e *cluster.Event) error {
var failed []string var failed []string
eh.RLock()
for key, w := range eh.ws { for key, w := range eh.ws {
if _, err := fmt.Fprintf(w, string(data)); err != nil { if _, err := fmt.Fprintf(w, string(data)); err != nil {
// collect them to handle later under Lock // collect them to handle later under Lock