Skip to content

fix: template build logs order #1622

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
dobrac merged 4 commits into from
Dec 17, 2025
+15 −9
Merged

fix: template build logs order #1622

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
859bcb0
fix: template build logs order
dobrac Dec 17, 2025
b01fb1e
make the reversing more obvious
dobrac Dec 17, 2025
59f2e68
exit foreach immediately when limit is reached
dobrac Dec 17, 2025
44f2459
Revert "exit foreach immediately when limit is reached"
dobrac Dec 17, 2025
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
10 changes: 2 additions & 8 deletions packages/orchestrator/internal/template/cache/build_cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package cache
import (
"context"
"fmt"
"slices"
"time"

"github.com/jellydator/ttlcache/v3"
Expand Down Expand Up @@ -75,13 +74,8 @@ func (b *BuildInfo) SetFail(reason *template_manager.TemplateBuildStatusReason)
})
}

func (b *BuildInfo) GetLogs(direction template_manager.LogsDirection) []*template_manager.TemplateBuildLogEntry {
lines := b.logs.Lines()
if direction == template_manager.LogsDirection_Backward {
slices.Reverse(lines)
}

return lines
func (b *BuildInfo) GetLogs() []*template_manager.TemplateBuildLogEntry {
return b.logs.Lines()
}

type BuildCache struct {
Expand Down
16 changes: 14 additions & 2 deletions packages/orchestrator/internal/template/server/template_status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package server

import (
"context"
"slices"
"time"

"github.com/pkg/errors"
Expand Down Expand Up @@ -43,9 +44,15 @@ func (s *ServerStore) TemplateBuildStatus(ctx context.Context, in *template_mana
end = e.AsTime()
}

logLines := buildInfo.GetLogs()
// If the direction is backward, we need to reverse the log entries to have them in the descending order
if direction == template_manager.LogsDirection_Backward {
slices.Reverse(logLines)
}

logEntries := make([]*template_manager.TemplateBuildLogEntry, 0)
logsCrawled := int32(0)
for _, entry := range buildInfo.GetLogs(direction) {
for _, entry := range logLines {
// Skip entries that are below the specified level
if entry.GetLevel().Number() < in.GetLevel().Number() {
continue
Expand All @@ -64,11 +71,16 @@ func (s *ServerStore) TemplateBuildStatus(ctx context.Context, in *template_mana
continue
}

logEntries = append(logEntries, entry)

if uint32(len(logEntries)) >= limit {
break
}
}

logEntries = append(logEntries, entry)
// If the direction is backward, we need to reverse the log entries again to have them back in the ascending order
if direction == template_manager.LogsDirection_Backward {
slices.Reverse(logEntries)
}

result := buildInfo.GetResult()
Expand Down
Loading