Skip to content

[teleport-update] Adjust download progress log output #49845

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
sclevine merged 3 commits into from
Dec 5, 2024
Merged

[teleport-update] Adjust download progress log output #49845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
64e3b5e
adjust logger
sclevine Dec 5, 2024
b1ba5b6
fix
sclevine Dec 5, 2024
0b46c73
fix
sclevine Dec 5, 2024
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
6 changes: 4 additions & 2 deletions lib/autoupdate/agent/logger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,10 @@ type progressLogger struct {
func (w *progressLogger) Write(p []byte) (n int, err error) {
w.n += len(p)
if w.n >= w.max*(w.l+1)/w.lines {
msg := fmt.Sprintf("%s - progress: %d%%", w.name, w.n*100/w.max)
w.log.Log(w.ctx, w.level, msg) //nolint:sloglint // msg cannot be constant
w.log.Log(w.ctx, w.level, "Downloading",
"file", w.name,
"progress", fmt.Sprintf("%d%%", w.n*100/w.max),
)
w.l++
}
return len(p), nil
Expand Down
2 changes: 1 addition & 1 deletion lib/autoupdate/agent/logger_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ func TestProgressLogger(t *testing.T) {
v, err := io.ReadAll(out)
require.NoError(t, err)
if len(v) > 0 {
e.out = fmt.Sprintf(`msg="test - progress: %s"`+"\n", e.out)
e.out = fmt.Sprintf(`msg=Downloading file=test progress=%s`+"\n", e.out)
}
require.Equal(t, e.out, string(v))
}
Expand Down