From 4624142c2db039343efc8c9b8070cf1e0d3a7262 Mon Sep 17 00:00:00 2001 From: cdoern Date: Tue, 6 Jul 2021 14:53:56 -0400 Subject: Implemented Until Query Parameter for Containers/logs compat containers/logs was missing actual usage of until query param. fixes #10859 Signed-off-by: cdoern --- libpod/logs/log.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'libpod/logs') diff --git a/libpod/logs/log.go b/libpod/logs/log.go index 308053b47..1a0223edc 100644 --- a/libpod/logs/log.go +++ b/libpod/logs/log.go @@ -34,6 +34,7 @@ type LogOptions struct { Details bool Follow bool Since time.Time + Until time.Time Tail int64 Timestamps bool Multi bool @@ -184,7 +185,12 @@ func (l *LogLine) String(options *LogOptions) string { // Since returns a bool as to whether a log line occurred after a given time func (l *LogLine) Since(since time.Time) bool { - return l.Time.After(since) + return l.Time.After(since) || since.IsZero() +} + +// Until returns a bool as to whether a log line occurred before a given time +func (l *LogLine) Until(until time.Time) bool { + return l.Time.Before(until) || until.IsZero() } // NewLogLine creates a logLine struct from a container log string -- cgit v1.2.3-54-g00ecf