make stream shutdown if self-node has been removed

Currently we will read the node from database, and since it is deleted, the id might be set to nil. Keep the node around and just shutdown, so it is cleanly removed from notifier. Fixes juanfont#2118 Signed-off-by: Kristoffer Dalby <[email protected]>
kradalby · Sep 11, 2024 · eb71f8a · eb71f8a
1 parent cac0ff3
commit eb71f8a
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/hscontrol/poll.go b/hscontrol/poll.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"math/rand/v2"
 	"net/http"
+	"slices"
 	"sort"
 	"strings"
 	"time"
@@ -273,6 +274,12 @@ func (m *mapSession) serveLongPoll() {
 				return
 			}
 
+			// If the node has been removed from headscale, close the stream
+			if slices.Contains(update.Removed, m.node.ID) {
+				m.tracef("node removed, closing stream")
+				return
+			}
+
 			m.tracef("received stream update: %s %s", update.Type.String(), update.Message)
 			mapResponseUpdateReceived.WithLabelValues(update.Type.String()).Inc()