synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-18 14:17:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: correct minor formatting issues in CLI (#6813)

Browse Source 
* fix: remove excess newlines from server startup

* Don't log benign closed pipe errors
This commit is contained in:
Ammar Bandukwala
2023-03-27 20:01:25 -05:00
committed by GitHub
parent 42b3d90221
commit 773580c7c9
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cli/server.go
View File

@ -484,7 +484,7 @@ func (r *RootCmd) Server(newAPI func(context.Context, *coderd.Options) (*coderd.
tunnelDone <-chan struct{} = make(chan struct{}, 1) tunnelDone <-chan struct{} = make(chan struct{}, 1)
) )
if cfg.AccessURL.String() == "" { if cfg.AccessURL.String() == "" {
cliui.Infof(inv.Stderr, "Opening tunnel so workspaces can connect to your deployment. For production scenarios, specify an external access URL\n") cliui.Infof(inv.Stderr, "Opening tunnel so workspaces can connect to your deployment. For production scenarios, specify an external access URL")
tunnel, err = devtunnel.New(ctx, logger.Named("devtunnel"), cfg.WgtunnelHost.String()) tunnel, err = devtunnel.New(ctx, logger.Named("devtunnel"), cfg.WgtunnelHost.String())
if err != nil { if err != nil {
return xerrors.Errorf("create tunnel: %w", err) return xerrors.Errorf("create tunnel: %w", err)
@ -531,7 +531,7 @@ func (r *RootCmd) Server(newAPI func(context.Context, *coderd.Options) (*coderd.
} }
// A newline is added before for visibility in terminal output. // A newline is added before for visibility in terminal output.
cliui.Infof(inv.Stdout, "\nView the Web UI: %s\n", cfg.AccessURL.String()) cliui.Infof(inv.Stdout, "\nView the Web UI: %s", cfg.AccessURL.String())
// Used for zero-trust instance identity with Google Cloud. // Used for zero-trust instance identity with Google Cloud.
googleTokenValidator, err := idtoken.NewValidator(ctx, option.WithoutAuthentication()) googleTokenValidator, err := idtoken.NewValidator(ctx, option.WithoutAuthentication())

4
coderd/workspaceagents.go
View File

@ -774,7 +774,11 @@ func (api *API) dialWorkspaceAgentTailnet(agentID uuid.UUID) (*codersdk.Workspac
go func() { go func() {
err := (*api.TailnetCoordinator.Load()).ServeClient(serverConn, uuid.New(), agentID) err := (*api.TailnetCoordinator.Load()).ServeClient(serverConn, uuid.New(), agentID)
if err != nil { if err != nil {
// Sometimes, we get benign closed pipe errors when the server is
// shutting down.
if api.ctx.Err() == nil {
api.Logger.Warn(ctx, "tailnet coordinator client error", slog.Error(err)) api.Logger.Warn(ctx, "tailnet coordinator client error", slog.Error(err))
}
_ = agentConn.Close() _ = agentConn.Close()
} }
}() }()