From 2a430ab43511501b29a029db900b84cae5e11a7b Mon Sep 17 00:00:00 2001 From: Dean Sheather Date: Mon, 28 Jul 2025 14:02:00 +1000 Subject: [PATCH] fix: avoid duplicating logs on Coder Connect Windows (#19052) The sinks are already added to the logger above, so they're just getting duplicated --- cli/vpndaemon_windows.go | 5 +---- vpn/tunnel.go | 6 ------ 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/cli/vpndaemon_windows.go b/cli/vpndaemon_windows.go index cf74558ffa..6c2d147da2 100644 --- a/cli/vpndaemon_windows.go +++ b/cli/vpndaemon_windows.go @@ -63,10 +63,7 @@ func (r *RootCmd) vpnDaemonRun() *serpent.Command { defer pipe.Close() logger.Info(ctx, "starting tunnel") - tunnel, err := vpn.NewTunnel(ctx, logger, pipe, vpn.NewClient(), - vpn.UseOSNetworkingStack(), - vpn.UseCustomLogSinks(sinks...), - ) + tunnel, err := vpn.NewTunnel(ctx, logger, pipe, vpn.NewClient(), vpn.UseOSNetworkingStack()) if err != nil { return xerrors.Errorf("create new tunnel for client: %w", err) } diff --git a/vpn/tunnel.go b/vpn/tunnel.go index e0203b6245..38d474c332 100644 --- a/vpn/tunnel.go +++ b/vpn/tunnel.go @@ -192,12 +192,6 @@ func UseAsLogger() TunnelOption { } } -func UseCustomLogSinks(sinks ...slog.Sink) TunnelOption { - return func(t *Tunnel) { - t.clientLogger = t.clientLogger.AppendSinks(sinks...) - } -} - func WithClock(clock quartz.Clock) TunnelOption { return func(t *Tunnel) { t.clock = clock