clean up logging, populate online for change

Signed-off-by: Kristoffer Dalby <[email protected]>
kradalby · Nov 27, 2023 · efe6d5e · efe6d5e
1 parent 57f3dfc
commit efe6d5e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 21 deletions.
diff --git a/hscontrol/mapper/tail.go b/hscontrol/mapper/tail.go
@@ -9,7 +9,6 @@ import (
 	"github.com/juanfont/headscale/hscontrol/policy"
 	"github.com/juanfont/headscale/hscontrol/types"
 	"github.com/juanfont/headscale/hscontrol/util"
-	"github.com/rs/zerolog/log"
 	"github.com/samber/lo"
 	"tailscale.com/tailcfg"
 )
@@ -91,16 +90,6 @@ func tailNode(
 		return nil, fmt.Errorf("tailNode, failed to create FQDN: %s", err)
 	}
 
-	if node.IsOnline != nil {
-		if *node.IsOnline {
-			log.Trace().Msgf("NODE IS ONLINE %s", node.Hostname)
-		} else {
-			log.Trace().Msgf("NODE IS NOT ONLINE %s", node.Hostname)
-		}
-	} else {
-		log.Trace().Msgf("NODE IS ONLINE IS NIL %s", node.Hostname)
-	}
-
 	tags, _ := pol.TagsOfNode(node)
 	tags = lo.Uniq(append(tags, node.ForcedTags...))
 

diff --git a/hscontrol/poll.go b/hscontrol/poll.go
@@ -348,27 +348,25 @@ func (h *Headscale) handlePoll(
 			case types.StateFullUpdate:
 				logInfo("Sending Full MapResponse")
 
-				log.Trace().Msgf("NODE FULLMAP BEGIN %s", node.Hostname)
-
-				// TODO(kradalby): We need to update online status in this case
 				data, err = mapp.FullMapResponse(mapRequest, node, h.ACLPolicy)
-				log.Trace().Msgf("NODE FULLMAP END %s", node.Hostname)
 			case types.StatePeerChanged:
 				logInfo("Sending Changed MapResponse")
 
-				log.Trace().Msgf("NODE CHANGEDMAP BEGIN %s", node.Hostname)
+				for _, node := range update.ChangeNodes {
+					isOnline := h.nodeNotifier.IsConnected(node.MachineKey)
+					node.IsOnline = &isOnline
+				}
 
-				// TODO(kradalby): We need to update online status in this case
 				data, err = mapp.PeerChangedResponse(mapRequest, node, update.ChangeNodes, h.ACLPolicy)
-				log.Trace().Msgf("NODE CHANGEDMAP END %s", node.Hostname)
 			case types.StatePeerChangedNoPolicy:
 				logInfo("Sending PeerChangedWithoutACL MapResponse")
 
-				log.Trace().Msgf("NODE PATCHMAP BEGIN %s", node.Hostname)
+				for _, node := range update.ChangeNodes {
+					isOnline := h.nodeNotifier.IsConnected(node.MachineKey)
+					node.IsOnline = &isOnline
+				}
 
-				// TODO(kradalby): We need to update online status in this case
 				data, err = mapp.PeerChangedWithoutACLResponse(mapRequest, node, update.ChangeNodes, h.ACLPolicy)
-				log.Trace().Msgf("NODE PATCHMAP BEGIN %s", node.Hostname)
 			case types.StatePeerChangedPatch:
 				logInfo("Sending PeerChangedPatch MapResponse")
 				data, err = mapp.PeerChangedPatchResponse(mapRequest, node, update.ChangePatches, h.ACLPolicy)