chore: nodeUpdater logging

spikecurtis · spikecurtis · commit 44c9bd5b6d88 · 2024-01-17T14:03:08.000+04:00
diff --git a/tailnet/configmaps.go b/tailnet/configmaps.go
@@ -137,6 +137,7 @@ func (c *configMaps) configLoop() {
 			c.Wait()
 		}
 		if c.closing {
+			c.logger.Debug(context.Background(), "closing configMaps configLoop")
 			return
 		}
 		// queue up the reconfiguration actions we will take while we have
@@ -146,19 +147,22 @@ func (c *configMaps) configLoop() {
 		if c.derpMapDirty {
 			derpMap := c.derpMapLocked()
 			actions = append(actions, func() {
+				c.logger.Debug(context.Background(), "updating engine DERP map", slog.F("derp_map", derpMap))
 				c.engine.SetDERPMap(derpMap)
 			})
 		}
 		if c.netmapDirty {
 			nm := c.netMapLocked()
 			actions = append(actions, func() {
+				c.logger.Debug(context.Background(), "updating engine network map", slog.F("network_map", nm))
 				c.engine.SetNetworkMap(nm)
 				c.reconfig(nm)
 			})
 		}
 		if c.filterDirty {
 			f := c.filterLocked()
 			actions = append(actions, func() {
+				c.logger.Debug(context.Background(), "updating engine filter", slog.F("filter", f))
 				c.engine.SetFilter(f)
 			})
 		}
diff --git a/tailnet/node.go b/tailnet/node.go
@@ -52,6 +52,7 @@ func (u *nodeUpdater) updateLoop() {
 			u.Wait()
 		}
 		if u.closing {
+			u.logger.Debug(context.Background(), "closing nodeUpdater updateLoop")
 			return
 		}
 		node := u.nodeLocked()
@@ -68,6 +69,7 @@ func (u *nodeUpdater) updateLoop() {
 		}
 
 		u.L.Unlock()
+		u.logger.Debug(context.Background(), "calling nodeUpdater callback", slog.F("node", node))
 		u.callback(node)
 		u.L.Lock()
 	}
@@ -126,6 +128,8 @@ func (u *nodeUpdater) setNetInfo(ni *tailcfg.NetInfo) {
 	if u.preferredDERP != ni.PreferredDERP {
 		dirty = true
 		u.preferredDERP = ni.PreferredDERP
+		u.logger.Debug(context.Background(), "new preferred DERP",
+			slog.F("preferred_derp", u.preferredDERP))
 	}
 	if !maps.Equal(u.derpLatency, ni.DERPLatency) {
 		dirty = true

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@ func (u *nodeUpdater) updateLoop() {`
`52`	`52`	`u.Wait()`
`53`	`53`	`}`
`54`	`54`	`if u.closing {`
	`55`	`+ u.logger.Debug(context.Background(), "closing nodeUpdater updateLoop")`
`55`	`56`	`return`
`56`	`57`	`}`
`57`	`58`	`node := u.nodeLocked()`
`@@ -68,6 +69,7 @@ func (u *nodeUpdater) updateLoop() {`
`68`	`69`	`}`
`69`	`70`
`70`	`71`	`u.L.Unlock()`
	`72`	`+ u.logger.Debug(context.Background(), "calling nodeUpdater callback", slog.F("node", node))`
`71`	`73`	`u.callback(node)`
`72`	`74`	`u.L.Lock()`
`73`	`75`	`}`
`@@ -126,6 +128,8 @@ func (u nodeUpdater) setNetInfo(ni tailcfg.NetInfo) {`
`126`	`128`	`if u.preferredDERP != ni.PreferredDERP {`
`127`	`129`	`dirty = true`
`128`	`130`	`u.preferredDERP = ni.PreferredDERP`
	`131`	`+ u.logger.Debug(context.Background(), "new preferred DERP",`
	`132`	`+ slog.F("preferred_derp", u.preferredDERP))`
`129`	`133`	`}`
`130`	`134`	`if !maps.Equal(u.derpLatency, ni.DERPLatency) {`
`131`	`135`	`dirty = true`