Commite8f0826

committed

Agent logging in appstest

Signed-off-by: Spike Curtis <spike@coder.com>

1 parenta04ed7f commite8f0826Copy full SHA for e8f0826

File tree

-1

lines changed

-1

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -648,6 +648,7 @@ func (a agent) createTailnet(ctx context.Context, derpMap tailcfg.DERPMap) (_`
`648`	`648`	`}`
`649`	`649`	`break`
`650`	`650`	`}`
	`651`	`+logger.Debug(ctx,"accepted pty conn",slog.F("remote",conn.RemoteAddr().String()))`
`651`	`652`	`wg.Add(1)`
`652`	`653`	`closed:=make(chanstruct{})`
`653`	`654`	`gofunc() {`
`@@ -676,6 +677,7 @@ func (a agent) createTailnet(ctx context.Context, derpMap tailcfg.DERPMap) (_`
`676`	`677`	`varmsg codersdk.WorkspaceAgentReconnectingPTYInit`
`677`	`678`	`err=json.Unmarshal(data,&msg)`
`678`	`679`	`iferr!=nil {`
	`680`	`+logger.Warn(ctx,"failed to unmarshal init",slog.F("raw",data))`
`679`	`681`	`return`
`680`	`682`	`}`
`681`	`683`	`_=a.handleReconnectingPTY(ctx,logger,msg,conn)`
`@@ -787,6 +789,7 @@ func (a agent) runCoordinator(ctx context.Context, network tailnet.Conn) error`
`787`	`789`	`}`
`788`	`790`
`789`	`791`	`func (a*agent)runStartupScript(ctx context.Context,scriptstring)error {`
	`792`	`+a.logger.Debug(ctx,"running agent startup script")`
`790`	`793`	`returna.runScript(ctx,"startup",script)`
`791`	`794`	`}`
`792`	`795`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ import (`
`16`	`16`	`"github.com/stretchr/testify/assert"`
`17`	`17`	`"github.com/stretchr/testify/require"`
`18`	`18`
	`19`	`+"cdr.dev/slog"`
`19`	`20`	`"cdr.dev/slog/sloggers/slogtest"`
`20`	`21`	`"github.com/coder/coder/agent"`
`21`	`22`	`"github.com/coder/coder/coderd/coderdtest"`
`@@ -364,7 +365,7 @@ func createWorkspaceWithApps(t testing.T, client codersdk.Client, orgID uuid.U`
`364`	`365`	`}`
`365`	`366`	`agentCloser:=agent.New(agent.Options{`
`366`	`367`	`Client:agentClient,`
`367`		`-Logger:slogtest.Make(t,nil).Named("agent"),`
	`368`	`+Logger:slogtest.Make(t,nil).Named("agent").Leveled(slog.LevelDebug),`
`368`	`369`	`})`
`369`	`370`	`t.Cleanup(func() {`
`370`	`371`	`_=agentCloser.Close()`

Comments

(0)