Skip to content

Commit 792a9f1

Browse files
authored
fix: fixes analytics tab when mixed logs are found (#3690)
1 parent a3a6c03 commit 792a9f1

File tree

1 file changed

+14
-18
lines changed

1 file changed

+14
-18
lines changed

internal/web/logs.go

+14-18
Original file line numberDiff line numberDiff line change
@@ -129,34 +129,30 @@ func (h *handler) fetchLogsBetweenDates(w http.ResponseWriter, r *http.Request)
129129

130130
for event := range events {
131131
if everything {
132+
if _, ok := event.Message.(string); onlyComplex && ok {
133+
continue
134+
}
132135
if err := encoder.Encode(event); err != nil {
133136
log.Error().Err(err).Msg("error encoding log event")
134137
}
135-
continue
136-
}
137-
138-
if onlyComplex {
139-
if _, ok := event.Message.(string); ok {
140-
continue
138+
} else {
139+
if regex != nil {
140+
if !search.Search(regex, event) {
141+
continue
142+
}
141143
}
142-
}
143144

144-
if regex != nil {
145-
if !search.Search(regex, event) {
145+
if _, ok := levels[event.Level]; !ok {
146146
continue
147147
}
148-
}
149148

150-
if _, ok := levels[event.Level]; !ok {
151-
continue
152-
}
149+
if lastSeenId != 0 && event.Id == lastSeenId {
150+
log.Debug().Uint32("lastSeenId", lastSeenId).Msg("found last seen id")
151+
break
152+
}
153153

154-
if lastSeenId != 0 && event.Id == lastSeenId {
155-
log.Debug().Uint32("lastSeenId", lastSeenId).Msg("found last seen id")
156-
break
154+
buffer.Push(event)
157155
}
158-
159-
buffer.Push(event)
160156
}
161157

162158
if everything || from.Before(containerService.Container.Created) {

0 commit comments

Comments
 (0)