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(cli): follow logs only when agent is starting (#13864)

Browse Source
This commit is contained in:
Mathias Fredriksson
2024-07-10 15:39:43 +03:00
committed by GitHub
parent 70046ea08d
commit c8484b4fc8
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cli/cliui/agent.go
View File

@ -132,7 +132,7 @@ func Agent(ctx context.Context, writer io.Writer, agentID uuid.UUID, opts AgentO
} }
stage := "Running workspace agent startup scripts" stage := "Running workspace agent startup scripts"
follow := opts.Wait follow := opts.Wait && agent.LifecycleState.Starting()
if !follow { if !follow {
stage += " (non-blocking)" stage += " (non-blocking)"
} }

5
cli/cliui/agent_test.go
View File

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