opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-21 17:38:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7893 from ashley-cui/journald

Browse Source 
Fix Podman logs reading journald
This commit is contained in:
OpenShift Merge Robot
2020-10-02 14:24:53 -04:00
committed by GitHub
parent b58980a43c c0d1954663
commit 1132bcfeb5
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libpod/container_log_linux.go
View File

@ -33,7 +33,7 @@ const (
func (c *Container) readFromJournal(ctx context.Context, options *logs.LogOptions, logChannel chan *logs.LogLine) error { func (c *Container) readFromJournal(ctx context.Context, options *logs.LogOptions, logChannel chan *logs.LogLine) error {
var config journal.JournalReaderConfig var config journal.JournalReaderConfig
if options.Tail < 0 { if options.Tail < 0 {
config.NumFromTail = math.MaxUint64 config.NumFromTail = 0
} else { } else {
config.NumFromTail = uint64(options.Tail) config.NumFromTail = uint64(options.Tail)
} }

1
test/e2e/logs_test.go
View File

@ -203,6 +203,7 @@ var _ = Describe("Podman logs", func() {
results.WaitWithDefaultTimeout() results.WaitWithDefaultTimeout()
Expect(results).To(Exit(0)) Expect(results).To(Exit(0))
Expect(len(results.OutputToStringArray())).To(Equal(3)) Expect(len(results.OutputToStringArray())).To(Equal(3))
Expect(results.OutputToString()).To(Equal("podman podman podman"))
}) })
It("using journald tail two lines", func() { It("using journald tail two lines", func() {

11
test/system/035-logs.bats
View File

@ -50,4 +50,15 @@ ${cid[1]} c
${cid[0]} d" "Sequential output from logs" ${cid[0]} d" "Sequential output from logs"
} }
@test "podman logs over journald" {
msg=$(random_string 20)
run_podman run --name myctr --log-driver journald $IMAGE echo $msg
run_podman logs myctr
is "$output" "$msg" "check that log output equals the container output"
run_podman rm myctr
}
# vim: filetype=sh # vim: filetype=sh