Merge pull request #2016 from mattbostock/fix_race_between_reload_and_stop

rules/manager.go: Fix race between reload and stop
2016-09-22 19:30:56 +02:00 · 2016-09-22 19:30:56 +02:00 · 5e57fa85c0
parent 71b332278d 926a5ab3dd
commit 5e57fa85c0
1 changed files with 3 additions and 0 deletions
--- a/rules/manager.go
+++ b/rules/manager.go
@ -365,6 +365,9 @@ func (m *Manager) Run() {

 // Stop the rule manager's rule evaluation cycles.
 func (m *Manager) Stop() {
+	m.mtx.Lock()
+	defer m.mtx.Unlock()
+
 	log.Info("Stopping rule manager...")

 	for _, eg := range m.groups {