Thanks to visit codestin.com
Credit goes to github.com

Skip to content

chore: cherry-pick coder desktop + corporate vpn fixes for 2.24 #19177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Aug 6, 2025
Merged

chore: cherry-pick coder desktop + corporate vpn fixes for 2.24 #19177

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c64b3c0
ci: conditionally disable spotlight indexing (#19124)
johnstcn Aug 2, 2025
9f2dc72
ci: bump xcode version to 16.1.0 (#19125)
johnstcn Aug 3, 2025
914daac
ci: set valid xcode version in release script (#19143)
ethanndickson Aug 4, 2025
618121c
chore: add support for tailscale soft isolation in VPN (#19023)
deansheather Jul 24, 2025
ba0b124
chore: remove soft isolation configurability (#19069)
deansheather Jul 29, 2025
19171e2
fix: avoid duplicating logs on Coder Connect Windows (#19052)
deansheather Jul 28, 2025
18b037d
chore: add `vpn-daemon run` command for macos (#19080)
ethanndickson Jul 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: avoid duplicating logs on Coder Connect Windows (#19052) 
The sinks are already added to the logger above, so they're just getting duplicated
  • Loading branch information
@deansheather @ethanndickson
deansheather authored and ethanndickson committed Aug 5, 2025
commit 19171e27c9624c435f97d4ae5e3b61c649bc7063
5 changes: 1 addition & 4 deletions cli/vpndaemon_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
6 changes: 0 additions & 6 deletions vpn/tunnel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down