From 6791c53d430df9a43bb8102b94636cef450e56fa Mon Sep 17 00:00:00 2001 From: Amir Raminfar Date: Thu, 5 Sep 2024 09:48:13 -0700 Subject: [PATCH] fix: fixes search while looking back history (#3256) --- internal/web/logs.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/internal/web/logs.go b/internal/web/logs.go index 55394a45..87fc5fe8 100644 --- a/internal/web/logs.go +++ b/internal/web/logs.go @@ -107,7 +107,7 @@ func (h *handler) fetchLogsBetweenDates(w http.ResponseWriter, r *http.Request) } buffer := utils.NewRingBuffer[*docker.LogEvent](500) - delta := to.Sub(from) + delta := max(to.Sub(from), time.Second*3) var regex *regexp.Regexp if r.URL.Query().Has("filter") { @@ -156,14 +156,17 @@ func (h *handler) fetchLogsBetweenDates(w http.ResponseWriter, r *http.Request) } } - from = from.Add(-delta) - delta = delta * 2 - if from.Before(containerService.Container.Created) { + log.Debug().Msg("reached beginning of logs") break } + + from = from.Add(-delta) + delta = delta * 2 } + log.Debug().Int("buffer_size", buffer.Len()).Msg("sending logs to client") + encoder := json.NewEncoder(w) for _, event := range buffer.Data() { if err := encoder.Encode(event); err != nil {