Skip to content

feat(codersdk/agentsdk): add StartupLogsSender and StartupLogsWriter #8129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Jun 22, 2023
Merged

feat(codersdk/agentsdk): add StartupLogsSender and StartupLogsWriter #8129

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5e48ee1
feat(agentsdk): add `StartupLogsSender` and `StartupLogsWriter`
mafredri Jun 21, 2023
d078203
add test for cr
mafredri Jun 21, 2023
c80755e
improve documentatiaon
mafredri Jun 21, 2023
cdb64e2
simplify log writer in favor of documentation
mafredri Jun 21, 2023
867a66e
minor correctness fix for writer
mafredri Jun 21, 2023
0c148ca
fix typo
mafredri Jun 21, 2023
e247bb4
prevent a potential race condition on select during send
mafredri Jun 21, 2023
e98b274
fix use of wrong context in error
mafredri Jun 21, 2023
9ac5d60
fix startup log level streaming via websocket
mafredri Jun 21, 2023
27923a3
Update codersdk/agentsdk/logs_test.go
mafredri Jun 22, 2023
02bea6e
Merge branch 'main' into mafredri/feat-add-startup-logs-sender-writer…
mafredri Jun 22, 2023
b2b4993
Merge branch 'main' into mafredri/feat-add-startup-logs-sender-writer…
mafredri Jun 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
improve documentatiaon
  • Loading branch information
@mafredri
mafredri committed Jun 21, 2023
commit c80755eed225b4c10460b9e834de5e12c756dab2
8 changes: 4 additions & 4 deletions agent/agent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -863,11 +863,11 @@ func (a *agent) runScript(ctx context.Context, lifecycle, script string) (err er
var stdout, stderr io.Writer = fileWriter, fileWriter
if lifecycle == "startup" {
send, flushAndClose := agentsdk.StartupLogsSender(a.client.PatchStartupLogs, logger)
// If ctx is canceled here (or in a writer below), we may be
// discarding logs, but that's okay because we're shutting down
// anyway. We could consider creating a new context here if we
// want better control over flush during shutdown.
defer func() {
// If ctx is canceled here, we may be discarding logs, but
// that's okay because we're shutting down anyway. We could
// consider creating a new context here if we want to
// improve flush during shutdown.
if err := flushAndClose(ctx); err != nil {
logger.Warn(ctx, "flush startup logs failed", slog.Error(err))
}
Expand Down