Commite1e2cde

committed

fix: stop logging workspace agent unless verbose

1 parentf82e76f commite1e2cdeCopy full SHA for e1e2cde

File tree

+12

-19

lines changed

+12

-19

lines changed

Lines changed: 5 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,19 +48,17 @@ func (r RootCmd) ping() serpent.Command {`
`48`	`48`	`returnerr`
`49`	`49`	`}`
`50`	`50`
`51`		`-logger:=inv.Logger`
	`51`	`+opts:=&workspacesdk.DialAgentOptions{}`
	`52`	`+`
`52`	`53`	`ifr.verbose {`
`53`		`-logger=logger.AppendSinks(sloghuman.Sink(inv.Stdout)).Leveled(slog.LevelDebug)`
	`54`	`+opts.Logger=inv.Logger.AppendSinks(sloghuman.Sink(inv.Stdout)).Leveled(slog.LevelDebug)`
`54`	`55`	`}`
`55`	`56`
`56`	`57`	`ifr.disableDirect {`
`57`	`58`	`_,_=fmt.Fprintln(inv.Stderr,"Direct connections disabled.")`
	`59`	`+opts.BlockEndpoints=true`
`58`	`60`	`}`
`59`		`-conn,err:=workspacesdk.New(client).`
`60`		`-DialAgent(ctx,workspaceAgent.ID,&workspacesdk.DialAgentOptions{`
`61`		`-Logger:logger,`
`62`		`-BlockEndpoints:r.disableDirect,`
`63`		`-})`
	`61`	`+conn,err:=workspacesdk.New(client).DialAgent(ctx,workspaceAgent.ID,opts)`
`64`	`62`	`iferr!=nil {`
`65`	`63`	`returnerr`
`66`	`64`	`}`

Lines changed: 5 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -95,19 +95,18 @@ func (r RootCmd) portForward() serpent.Command {`
`95`	`95`	`returnxerrors.Errorf("await agent: %w",err)`
`96`	`96`	`}`
`97`	`97`
	`98`	`+opts:=&workspacesdk.DialAgentOptions{}`
	`99`	`+`
`98`	`100`	`logger:=inv.Logger`
`99`	`101`	`ifr.verbose {`
`100`		`-logger=logger.AppendSinks(sloghuman.Sink(inv.Stdout)).Leveled(slog.LevelDebug)`
	`102`	`+opts.Logger=logger.AppendSinks(sloghuman.Sink(inv.Stdout)).Leveled(slog.LevelDebug)`
`101`	`103`	`}`
`102`	`104`
`103`	`105`	`ifr.disableDirect {`
`104`	`106`	`_,_=fmt.Fprintln(inv.Stderr,"Direct connections disabled.")`
	`107`	`+opts.BlockEndpoints=true`
`105`	`108`	`}`
`106`		`-conn,err:=workspacesdk.New(client).`
`107`		`-DialAgent(ctx,workspaceAgent.ID,&workspacesdk.DialAgentOptions{`
`108`		`-Logger:logger,`
`109`		`-BlockEndpoints:r.disableDirect,`
`110`		`-})`
	`109`	`+conn,err:=workspacesdk.New(client).DialAgent(ctx,workspaceAgent.ID,opts)`
`111`	`110`	`iferr!=nil {`
`112`	`111`	`returnerr`
`113`	`112`	`}`

Lines changed: 2 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -56,13 +56,9 @@ func (r RootCmd) speedtest() serpent.Command {`
`56`	`56`	`returnxerrors.Errorf("await agent: %w",err)`
`57`	`57`	`}`
`58`	`58`
`59`		`-logger:=inv.Logger.AppendSinks(sloghuman.Sink(inv.Stderr))`
	`59`	`+opts:=&workspacesdk.DialAgentOptions{}`
`60`	`60`	`ifr.verbose {`
`61`		`-logger=logger.Leveled(slog.LevelDebug)`
`62`		`-}`
`63`		`-`
`64`		`-opts:=&workspacesdk.DialAgentOptions{`
`65`		`-Logger:logger,`
	`61`	`+opts.Logger=inv.Logger.AppendSinks(sloghuman.Sink(inv.Stderr)).Leveled(slog.LevelDebug)`
`66`	`62`	`}`
`67`	`63`	`ifr.disableDirect {`
`68`	`64`	`_,_=fmt.Fprintln(inv.Stderr,"Direct connections disabled.")`

Comments

(0)