fix unsubscription deadlock

0xsequence · Mar 22, 2024 · 98ae1a4 · 98ae1a4
1 parent a65c80f
commit 98ae1a4
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/ethmonitor/ethmonitor.go b/ethmonitor/ethmonitor.go
@@ -986,10 +986,15 @@ func (m *Monitor) NumSubscribers() int {
 
 func (m *Monitor) UnsubscribeAll(err error) {
 	m.mu.Lock()
-	defer m.mu.Unlock()
+	var subs []*subscriber
 	for _, sub := range m.subscribers {
+		subs = append(subs, sub)
+	}
+	m.mu.Unlock()
+
+	for _, sub := range subs {
 		sub.err = err
-		sub.Unsubscribe()
+		sub.unsubscribe()
 	}
 }