Commit2a430ab

authored

fix: avoid duplicating logs on Coder Connect Windows (#19052)

The sinks are already added to the logger above, so they're just getting duplicated

1 parent8d6cc51 commit2a430abCopy full SHA for 2a430ab

File tree

-10

lines changed

-10

lines changed

Lines changed: 1 addition & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -63,10 +63,7 @@ func (r RootCmd) vpnDaemonRun() serpent.Command {`
`63`	`63`	`deferpipe.Close()`
`64`	`64`
`65`	`65`	`logger.Info(ctx,"starting tunnel")`
`66`		`-tunnel,err:=vpn.NewTunnel(ctx,logger,pipe,vpn.NewClient(),`
`67`		`-vpn.UseOSNetworkingStack(),`
`68`		`-vpn.UseCustomLogSinks(sinks...),`
`69`		`-)`
	`66`	`+tunnel,err:=vpn.NewTunnel(ctx,logger,pipe,vpn.NewClient(),vpn.UseOSNetworkingStack())`
`70`	`67`	`iferr!=nil {`
`71`	`68`	`returnxerrors.Errorf("create new tunnel for client: %w",err)`
`72`	`69`	`}`

Lines changed: 0 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -192,12 +192,6 @@ func UseAsLogger() TunnelOption {`
`192`	`192`	`}`
`193`	`193`	`}`
`194`	`194`
`195`		`-funcUseCustomLogSinks(sinks...slog.Sink)TunnelOption {`
`196`		`-returnfunc(t*Tunnel) {`
`197`		`-t.clientLogger=t.clientLogger.AppendSinks(sinks...)`
`198`		`-}`
`199`		`-}`
`200`		`-`
`201`	`195`	`funcWithClock(clock quartz.Clock)TunnelOption {`
`202`	`196`	`returnfunc(t*Tunnel) {`
`203`	`197`	`t.clock=clock`

Comments

(0)