Commit773580c

authored

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

* fix: remove excess newlines from server startup* Don't log benign closed pipe errors

1 parent42b3d90 commit773580cCopy full SHA for 773580c

File tree

-3

lines changed

-3

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -484,7 +484,7 @@ func (r RootCmd) Server(newAPI func(context.Context, coderd.Options) (*coderd.`
`484`	`484`	`tunnelDone<-chanstruct{}=make(chanstruct{},1)`
`485`	`485`	`)`
`486`	`486`	`ifcfg.AccessURL.String()=="" {`
`487`		`-cliui.Infof(inv.Stderr,"Opening tunnel so workspaces can connect to your deployment. For production scenarios, specify an external access URL\n")`
	`487`	`+cliui.Infof(inv.Stderr,"Opening tunnel so workspaces can connect to your deployment. For production scenarios, specify an external access URL")`
`488`	`488`	`tunnel,err=devtunnel.New(ctx,logger.Named("devtunnel"),cfg.WgtunnelHost.String())`
`489`	`489`	`iferr!=nil {`
`490`	`490`	`returnxerrors.Errorf("create tunnel: %w",err)`
`@@ -531,7 +531,7 @@ func (r RootCmd) Server(newAPI func(context.Context, coderd.Options) (*coderd.`
`531`	`531`	`}`
`532`	`532`
`533`	`533`	`// A newline is added before for visibility in terminal output.`
`534`		`-cliui.Infof(inv.Stdout,"\nView the Web UI: %s\n",cfg.AccessURL.String())`
	`534`	`+cliui.Infof(inv.Stdout,"\nView the Web UI: %s",cfg.AccessURL.String())`
`535`	`535`
`536`	`536`	`// Used for zero-trust instance identity with Google Cloud.`
`537`	`537`	`googleTokenValidator,err:=idtoken.NewValidator(ctx,option.WithoutAuthentication())`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -774,7 +774,11 @@ func (api API) dialWorkspaceAgentTailnet(agentID uuid.UUID) (codersdk.Workspac`
`774`	`774`	`gofunc() {`
`775`	`775`	`err:= (*api.TailnetCoordinator.Load()).ServeClient(serverConn,uuid.New(),agentID)`
`776`	`776`	`iferr!=nil {`
`777`		`-api.Logger.Warn(ctx,"tailnet coordinator client error",slog.Error(err))`
	`777`	`+// Sometimes, we get benign closed pipe errors when the server is`
	`778`	`+// shutting down.`
	`779`	`+ifapi.ctx.Err()==nil {`
	`780`	`+api.Logger.Warn(ctx,"tailnet coordinator client error",slog.Error(err))`
	`781`	`+}`
`778`	`782`	`_=agentConn.Close()`
`779`	`783`	`}`
`780`	`784`	`}()`

Comments

(0)