fix: stop logging context Canceled as error (#11177)

spikecurtis · web-flow · commit bf3b35b1e2a5 · 2023-12-13T13:08:30.000+04:00
fixes #11166 and a related log that could have the same problem
diff --git a/enterprise/tailnet/pgcoord.go b/enterprise/tailnet/pgcoord.go
@@ -639,7 +639,7 @@ func (m *mapper) run() {
 			m.logger.Debug(m.ctx, "skipping nil node update")
 			continue
 		}
-		if err := m.c.Enqueue(update); err != nil {
+		if err := m.c.Enqueue(update); err != nil && !xerrors.Is(err, context.Canceled) {
 			m.logger.Error(m.ctx, "failed to enqueue node update", slog.Error(err))
 		}
 	}
diff --git a/tailnet/coordinator.go b/tailnet/coordinator.go
@@ -810,7 +810,7 @@ func v1RespLoop(ctx context.Context, cancel context.CancelFunc, logger slog.Logg
 			continue
 		}
 		err = q.Enqueue(nodes)
-		if err != nil {
+		if err != nil && !xerrors.Is(err, context.Canceled) {
 			logger.Error(ctx, "v1RespLoop failed to enqueue v1 update", slog.Error(err))
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -639,7 +639,7 @@ func (m *mapper) run() {`
`639`	`639`	`m.logger.Debug(m.ctx, "skipping nil node update")`
`640`	`640`	`continue`
`641`	`641`	`}`
`642`		`- if err := m.c.Enqueue(update); err != nil {`
	`642`	`+ if err := m.c.Enqueue(update); err != nil && !xerrors.Is(err, context.Canceled) {`
`643`	`643`	`m.logger.Error(m.ctx, "failed to enqueue node update", slog.Error(err))`
`644`	`644`	`}`
`645`	`645`	`}`
Original file line number	Diff line number	Diff line change
`@@ -810,7 +810,7 @@ func v1RespLoop(ctx context.Context, cancel context.CancelFunc, logger slog.Logg`
`810`	`810`	`continue`
`811`	`811`	`}`
`812`	`812`	`err = q.Enqueue(nodes)`
`813`		`- if err != nil {`
	`813`	`+ if err != nil && !xerrors.Is(err, context.Canceled) {`
`814`	`814`	`logger.Error(ctx, "v1RespLoop failed to enqueue v1 update", slog.Error(err))`
`815`	`815`	`}`
`816`	`816`	`}`