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 /libpod | |
| 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 'libpod')
| -rw-r--r-- | libpod/events/filters.go | 4 | ||||
| -rw-r--r-- | libpod/events/journal_linux.go | 4 | ||||
| -rw-r--r-- | libpod/events/logfile.go | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/libpod/events/filters.go b/libpod/events/filters.go index 4d27e8fc4..d5e2b81f3 100644 --- a/libpod/events/filters.go +++ b/libpod/events/filters.go @@ -135,7 +135,7 @@ func generateEventFilters(filters []string, since, until string) (map[string][]E } if len(since) > 0 { - timeSince, err := util.ParseInputTime(since) + timeSince, err := util.ParseInputTime(since, true) if err != nil { return nil, errors.Wrapf(err, "unable to convert since time of %s", since) } @@ -144,7 +144,7 @@ func generateEventFilters(filters []string, since, until string) (map[string][]E } if len(until) > 0 { - timeUntil, err := util.ParseInputTime(until) + timeUntil, err := util.ParseInputTime(until, false) if err != nil { return nil, errors.Wrapf(err, "unable to convert until time of %s", until) } diff --git a/libpod/events/journal_linux.go b/libpod/events/journal_linux.go index 7006290e9..a3e0d9754 100644 --- a/libpod/events/journal_linux.go +++ b/libpod/events/journal_linux.go @@ -73,13 +73,15 @@ func (e EventJournalD) Read(ctx context.Context, options ReadOptions) error { if err != nil { return errors.Wrapf(err, "failed to parse event filters") } + var untilTime time.Time if len(options.Until) > 0 { - untilTime, err = util.ParseInputTime(options.Until) + untilTime, err = util.ParseInputTime(options.Until, false) if err != nil { return err } } + j, err := sdjournal.NewJournal() if err != nil { return err diff --git a/libpod/events/logfile.go b/libpod/events/logfile.go index 952444f2b..e3f0ab8f0 100644 --- a/libpod/events/logfile.go +++ b/libpod/events/logfile.go @@ -53,7 +53,7 @@ func (e EventLogFile) Read(ctx context.Context, options ReadOptions) error { return err } if len(options.Until) > 0 { - untilTime, err := util.ParseInputTime(options.Until) + untilTime, err := util.ParseInputTime(options.Until, false) if err != nil { return err } |