Nate's fix on my request introduced a race condition. Fix it.

sinanawad · Apr 12, 2016 · cd2420f · cd2420f
1 parent dd9828e
commit cd2420f
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/utils/stringforwarder/stringforwarder.go b/utils/stringforwarder/stringforwarder.go
@@ -73,12 +73,17 @@ func (f *StringForwarder) Stop() uint64 {
 // closes started to signal that it has begun, and will clean itself up when
 // done is closed.
 func (f *StringForwarder) loop(started chan struct{}, callback func(string)) {
+	// Grab a copy of done so we can notice it is closed, even though
+	// StringForwarder.Stop() will set it to nil.
+	f.mu.Lock()
+	done := f.done
+	f.mu.Unlock()
 	close(started)
 	for {
 		select {
 		case msg := <-f.messages:
 			callback(msg)
-		case <-f.done:
+		case <-done:
 			return
 		}
 	}