diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-10-31 15:39:06 +0100 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-10-31 19:55:36 +0100 |
| commit | 11750df51015a675c1145982847e08397c7606ea (patch) | |
| tree | 4780e20130f24bff8cc6e6a4434d4e79628fee31 /libpod/logs | |
| parent | ffe36ea9964242235571ad1d21a0c4d825ef5971 (diff) | |
| download | podman-11750df51015a675c1145982847e08397c7606ea.tar.gz podman-11750df51015a675c1145982847e08397c7606ea.tar.bz2 podman-11750df51015a675c1145982847e08397c7606ea.zip | |
logs: support --tail 0
change the default to -1, so that we can change the semantic of
"--tail 0" to not print any existing log line.
Closes: https://github.com/containers/libpod/issues/4396
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'libpod/logs')
| -rw-r--r-- | libpod/logs/log.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libpod/logs/log.go b/libpod/logs/log.go index 0b1703567..0330df06a 100644 --- a/libpod/logs/log.go +++ b/libpod/logs/log.go @@ -31,7 +31,7 @@ type LogOptions struct { Details bool Follow bool Since time.Time - Tail uint64 + Tail int64 Timestamps bool Multi bool WaitGroup *sync.WaitGroup @@ -54,8 +54,10 @@ func GetLogFile(path string, options *LogOptions) (*tail.Tail, []*LogLine, error logTail []*LogLine ) // whence 0=origin, 2=end - if options.Tail > 0 { + if options.Tail >= 0 { whence = 2 + } + if options.Tail > 0 { logTail, err = getTailLog(path, int(options.Tail)) if err != nil { return nil, nil, err |