event: fix race in event monitoring code

fsouza · Jul 26, 2017 · 57f271a · 57f271a
1 parent 98f886e
commit 57f271a
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/event.go b/event.go
@@ -342,11 +342,12 @@ func (c *Client) eventHijack(startTime int64, eventChan chan *APIEvents, errChan
 			if event.Time == 0 {
 				continue
 			}
-			if !c.eventMonitor.isEnabled() || c.eventMonitor.C != eventChan {
-				return
-			}
 			transformEvent(&event)
-			eventChan <- &event
+			c.eventMonitor.RLock()
+			if c.eventMonitor.enabled && c.eventMonitor.C == eventChan {
+				eventChan <- &event
+			}
+			c.eventMonitor.RUnlock()
 		}
 	}(res, conn)
 	return nil