fix panic during replays

EmOne · Nov 16, 2016 · 01f3409 · 01f3409
1 parent 41738bd
commit 01f3409
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -30,6 +30,8 @@ stream
 
 ### Bugfixes
 
+- [#1045](https://github.com/influxdata/kapacitor/issues/1045): Fix panic during replays.
+
 
 
 ## v1.1.0 [2016-10-07]

diff --git a/edge.go b/edge.go
@@ -31,6 +31,9 @@ type BatchCollector interface {
 }
 
 type Edge struct {
+	mu     sync.Mutex
+	closed bool
+
 	stream chan models.Point
 	batch  chan models.Batch
 
@@ -108,7 +111,14 @@ func (e *Edge) readGroupStats(f func(group models.GroupID, collected, emitted in
 
 // Close the edge, this can only be called after all
 // collect calls to the edge have finished.
+// Can be called multiple times.
 func (e *Edge) Close() {
+	e.mu.Lock()
+	defer e.mu.Unlock()
+	if e.closed {
+		return
+	}
+	e.closed = true
 	e.logger.Printf(
 		"D! closing c: %d e: %d\n",
 		e.collected.IntValue(),
Original file line number	Diff line number	Diff line change
Expand Up		@@ -30,6 +30,8 @@ stream

		### Bugfixes

		- [#1045](https://github.com/influxdata/kapacitor/issues/1045): Fix panic during replays.



		## v1.1.0 [2016-10-07]
Expand Down