1
0
mirror of https://github.com/amir20/dozzle.git synced 2026-01-04 20:14:59 +01:00

fix: fixes analytics tab when mixed logs are found (#3690)

This commit is contained in:
Amir Raminfar
2025-03-08 14:19:51 -08:00
committed by GitHub
parent a3a6c03f11
commit 792a9f1187

View File

@@ -129,34 +129,30 @@ func (h *handler) fetchLogsBetweenDates(w http.ResponseWriter, r *http.Request)
for event := range events {
if everything {
if _, ok := event.Message.(string); onlyComplex && ok {
continue
}
if err := encoder.Encode(event); err != nil {
log.Error().Err(err).Msg("error encoding log event")
}
continue
}
} else {
if regex != nil {
if !search.Search(regex, event) {
continue
}
}
if onlyComplex {
if _, ok := event.Message.(string); ok {
if _, ok := levels[event.Level]; !ok {
continue
}
}
if regex != nil {
if !search.Search(regex, event) {
continue
if lastSeenId != 0 && event.Id == lastSeenId {
log.Debug().Uint32("lastSeenId", lastSeenId).Msg("found last seen id")
break
}
}
if _, ok := levels[event.Level]; !ok {
continue
buffer.Push(event)
}
if lastSeenId != 0 && event.Id == lastSeenId {
log.Debug().Uint32("lastSeenId", lastSeenId).Msg("found last seen id")
break
}
buffer.Push(event)
}
if everything || from.Before(containerService.Container.Created) {