From cae8b88f607f94e7231db06da4afcec1d50574ca Mon Sep 17 00:00:00 2001 From: Mathias Fredriksson Date: Sat, 25 Feb 2023 10:06:38 +0200 Subject: [PATCH] fix(tailnet): Avoid logging netmap (#6342) --- tailnet/conn.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tailnet/conn.go b/tailnet/conn.go index e2e55a971c..6b19058691 100644 --- a/tailnet/conn.go +++ b/tailnet/conn.go @@ -179,7 +179,7 @@ func NewConn(options *Options) (conn *Conn, err error) { wireguardEngine = wgengine.NewWatchdog(wireguardEngine) wireguardEngine.SetDERPMap(options.DERPMap) netMapCopy := *netMap - options.Logger.Debug(context.Background(), "updating network map", slog.F("net_map", netMapCopy)) + options.Logger.Debug(context.Background(), "updating network map") wireguardEngine.SetNetworkMap(&netMapCopy) localIPSet := netipx.IPSetBuilder{} @@ -333,7 +333,7 @@ func (c *Conn) SetDERPMap(derpMap *tailcfg.DERPMap) { c.wireguardEngine.SetDERPMap(derpMap) c.netMap.DERPMap = derpMap netMapCopy := *c.netMap - c.logger.Debug(context.Background(), "updating network map", slog.F("net_map", netMapCopy)) + c.logger.Debug(context.Background(), "updating network map") c.wireguardEngine.SetNetworkMap(&netMapCopy) } @@ -344,7 +344,7 @@ func (c *Conn) RemoveAllPeers() error { c.netMap.Peers = []*tailcfg.Node{} c.peerMap = map[tailcfg.NodeID]*tailcfg.Node{} netMapCopy := *c.netMap - c.logger.Debug(context.Background(), "updating network map", slog.F("net_map", netMapCopy)) + c.logger.Debug(context.Background(), "updating network map") c.wireguardEngine.SetNetworkMap(&netMapCopy) cfg, err := nmcfg.WGCfg(c.netMap, Logger(c.logger.Named("wgconfig")), netmap.AllowSingleHosts, "") if err != nil { @@ -428,7 +428,7 @@ func (c *Conn) UpdateNodes(nodes []*Node, replacePeers bool) error { c.netMap.Peers = append(c.netMap.Peers, peer.Clone()) } netMapCopy := *c.netMap - c.logger.Debug(context.Background(), "updating network map", slog.F("net_map", netMapCopy)) + c.logger.Debug(context.Background(), "updating network map") c.wireguardEngine.SetNetworkMap(&netMapCopy) cfg, err := nmcfg.WGCfg(c.netMap, Logger(c.logger.Named("wgconfig")), netmap.AllowSingleHosts, "") if err != nil {