diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-08-26 10:12:09 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-26 10:12:09 -0400 |
commit | 54e0afffe7dd8e5ab7daa75de2f06331cd78dd48 (patch) | |
tree | 9eda4d0f39327c2e777aa1faa600968c7963ab9e /pkg/api/handlers | |
parent | cb235592702550c94bdc526a033ca2cebecb7337 (diff) | |
parent | d06d285e66251784126b4f19e047c2a93182d08e (diff) | |
download | podman-54e0afffe7dd8e5ab7daa75de2f06331cd78dd48.tar.gz podman-54e0afffe7dd8e5ab7daa75de2f06331cd78dd48.tar.bz2 podman-54e0afffe7dd8e5ab7daa75de2f06331cd78dd48.zip |
Merge pull request #11218 from cdoern/untilBug
logFile until flag issue, negative duration replaced with positive
Diffstat (limited to 'pkg/api/handlers')
-rw-r--r-- | pkg/api/handlers/compat/containers_logs.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/api/handlers/compat/containers_logs.go b/pkg/api/handlers/compat/containers_logs.go index 0c10ce75e..a7cfe09ea 100644 --- a/pkg/api/handlers/compat/containers_logs.go +++ b/pkg/api/handlers/compat/containers_logs.go @@ -63,7 +63,7 @@ func LogsFromContainer(w http.ResponseWriter, r *http.Request) { var since time.Time if _, found := r.URL.Query()["since"]; found { - since, err = util.ParseInputTime(query.Since) + since, err = util.ParseInputTime(query.Since, true) if err != nil { utils.BadRequest(w, "since", query.Since, err) return @@ -73,7 +73,7 @@ func LogsFromContainer(w http.ResponseWriter, r *http.Request) { var until time.Time if _, found := r.URL.Query()["until"]; found { if query.Until != "0" { - until, err = util.ParseInputTime(query.Until) + until, err = util.ParseInputTime(query.Until, false) if err != nil { utils.BadRequest(w, "until", query.Until, err) return |