summaryrefslogtreecommitdiff
path: root/pkg/api
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-07-10 06:31:49 -0400
committerGitHub <noreply@github.com>2021-07-10 06:31:49 -0400
commitbef1f03d3ca8bfd90f4cbb295d99bf97df74a815 (patch)
tree79d4a907422c070ec0a2db9628eea170bc16dfaa /pkg/api
parent24a5eeafc54ef7b1c04bfa8efe78fddd3f7e4014 (diff)
parent4624142c2db039343efc8c9b8070cf1e0d3a7262 (diff)
downloadpodman-bef1f03d3ca8bfd90f4cbb295d99bf97df74a815.tar.gz
podman-bef1f03d3ca8bfd90f4cbb295d99bf97df74a815.tar.bz2
podman-bef1f03d3ca8bfd90f4cbb295d99bf97df74a815.zip
Merge pull request #10868 from cdoern/untilLog
Implemented Until Query Parameter for Containers/logs
Diffstat (limited to 'pkg/api')
-rw-r--r--pkg/api/handlers/compat/containers_logs.go14
1 files changed, 8 insertions, 6 deletions
diff --git a/pkg/api/handlers/compat/containers_logs.go b/pkg/api/handlers/compat/containers_logs.go
index cb4dee4d2..656e2c627 100644
--- a/pkg/api/handlers/compat/containers_logs.go
+++ b/pkg/api/handlers/compat/containers_logs.go
@@ -72,11 +72,12 @@ func LogsFromContainer(w http.ResponseWriter, r *http.Request) {
var until time.Time
if _, found := r.URL.Query()["until"]; found {
- // FIXME: until != since but the logs backend does not yet support until.
- since, err = util.ParseInputTime(query.Until)
- if err != nil {
- utils.BadRequest(w, "until", query.Until, err)
- return
+ if query.Until != "0" {
+ until, err = util.ParseInputTime(query.Until)
+ if err != nil {
+ utils.BadRequest(w, "until", query.Until, err)
+ return
+ }
}
}
@@ -84,6 +85,7 @@ func LogsFromContainer(w http.ResponseWriter, r *http.Request) {
Details: true,
Follow: query.Follow,
Since: since,
+ Until: until,
Tail: tail,
Timestamps: query.Timestamps,
}
@@ -119,7 +121,7 @@ func LogsFromContainer(w http.ResponseWriter, r *http.Request) {
for line := range logChannel {
if _, found := r.URL.Query()["until"]; found {
- if line.Time.After(until) {
+ if line.Time.After(until) && !until.IsZero() {
break
}
}