Commitc8484b4

authored

fix(cli): follow logs only when agent is starting (#13864)

1 parent70046ea commitc8484b4Copy full SHA for c8484b4

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ func Agent(ctx context.Context, writer io.Writer, agentID uuid.UUID, opts AgentO`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`stage:="Running workspace agent startup scripts"`
`135`		`-follow:=opts.Wait`
	`135`	`+follow:=opts.Wait&&agent.LifecycleState.Starting()`
`136`	`136`	`if!follow {`
`137`	`137`	`stage+=" (non-blocking)"`
`138`	`138`	`}`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -258,10 +258,9 @@ func TestAgent(t *testing.T) {`
`258`	`258`	`},`
`259`	`259`	`},`
`260`	`260`	`want: []string{`
`261`		`-"⧗ Running workspace agent startup scripts",`
`262`		`-"ℹ︎ To connect immediately, reconnect with --wait=no or CODER_SSH_WAIT=no, see --help for more information.",`
	`261`	`+"⧗ Running workspace agent startup scripts (non-blocking)",`
`263`	`262`	`"Hello world",`
`264`		`-"✘ Running workspace agent startup scripts",`
	`263`	`+"✘ Running workspace agent startup scripts (non-blocking)",`
`265`	`264`	`"Warning: A startup script exited with an error and your workspace may be incomplete.",`
`266`	`265`	`"For more information and troubleshooting, see",`
`267`	`266`	`},`

Comments

(0)